Skip to content

Commit c37d811

Browse files
sfc-gh-pfussfc-gh-pfus
authored
Merge branch 'master' into SNOW-1825790-token-cache
2 parents 577ce1c + f5582f4 commit c37d811

10 files changed

+90
-3
lines changed

‎.github/workflows/build-test.yml

+26
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,29 @@ jobs:
138138
uses: codecov/codecov-action@v5
139139
with:
140140
token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
141+
ecc:
142+
runs-on: ubuntu-latest
143+
strategy:
144+
fail-fast: false
145+
name: Ecliptic curves check
146+
steps:
147+
- uses: actions/checkout@v4
148+
- uses: actions/setup-java@v4 # for wiremock
149+
with:
150+
java-version: 17
151+
distribution: 'temurin'
152+
- name: Setup go
153+
uses: actions/setup-go@v5
154+
with:
155+
go-version: ${{ matrix.go }}
156+
- name: Test
157+
shell: bash
158+
env:
159+
PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
160+
CLOUD_PROVIDER: ${{ matrix.cloud }}
161+
GORACE: history_size=7
162+
GO_TEST_PARAMS: ${{ inputs.goTestParams }} -run TestQueryViaHttps
163+
WIREMOCK_PORT: 14335
164+
WIREMOCK_HTTPS_PORT: 13567
165+
WIREMOCK_ENABLE_ECDSA: true
166+
run: ./ci/test.sh

‎ci/scripts/README.md

+10
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,14 @@ Password for CA is `password`.
44

55
```bash
66
openssl x509 -req -in wiremock.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out wiremock.crt -days 365 -sha256 -extfile wiremock.v3.ext
7+
openssl pkcs12 -export -out wiremock.p12 -inkey wiremock.key -in wiremock.crt
8+
```
9+
10+
# Refreshing ECDSA cert
11+
12+
When asked for Common Name, use `localhost`.
13+
14+
```bash
15+
openssl req -new -x509 -key wiremock-ecdsa.key -out wiremock-ecdsa.crt -days 365
16+
openssl pkcs12 -export -inkey wiremock-ecdsa.key -in wiremock-ecdsa.crt -out wiremock-ecdsa.p12
717
```

‎ci/scripts/ca.srl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
54587BDD05D4BE6A6D8852CA7FDB421189EA1C67
1+
54587BDD05D4BE6A6D8852CA7FDB421189EA1C69

‎ci/scripts/run_wiremock.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44

55
cd $SCRIPT_DIR
66

7+
if [[ "$1" == "--ecdsa" || "$WIREMOCK_ENABLE_ECDSA" == "true" ]] ; then
8+
echo "Using ecliptic curves"
9+
pfxFile="$SCRIPT_DIR/wiremock-ecdsa.p12"
10+
else
11+
echo "Using RSA"
12+
pfxFile="$SCRIPT_DIR/wiremock.p12"
13+
fi
14+
715
if [ ! -f "$SCRIPT_DIR/wiremock-standalone-3.11.0.jar" ]; then
816
curl -O https://repo1.maven.org/maven2/org/wiremock/wiremock-standalone/3.11.0/wiremock-standalone-3.11.0.jar
917
fi
1018

11-
java -jar "$SCRIPT_DIR/wiremock-standalone-3.11.0.jar" --verbose --port ${WIREMOCK_PORT:=14355} --https-port ${WIREMOCK_HTTPS_PORT:=13567} --https-keystore "$SCRIPT_DIR/wiremock.p12" --keystore-type PKCS12 --keystore-password password
19+
java -jar "$SCRIPT_DIR/wiremock-standalone-3.11.0.jar" --verbose --port ${WIREMOCK_PORT:=14355} --https-port ${WIREMOCK_HTTPS_PORT:=13567} --https-keystore "$pfxFile" --keystore-type PKCS12 --keystore-password password

‎ci/scripts/wiremock-ecdsa-pub.key

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-----BEGIN PUBLIC KEY-----
2+
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEX3j37DbAKoO6Cwn0TsoMcsVXEF52
3+
lDa2tEHX2kMoxLExE4cgBipPyHgwNEblfAbaA1eC03fytJZw0wd08GvA+Q==
4+
-----END PUBLIC KEY-----

‎ci/scripts/wiremock-ecdsa.crt

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIEFzCCAf+gAwIBAgIUVFh73QXUvmptiFLKf9tCEYnqHGkwDQYJKoZIhvcNAQEL
3+
BQAwezELMAkGA1UEBhMCUEwxFDASBgNVBAgMC01hem93aWVja2llMQ8wDQYDVQQH
4+
DAZXYXJzYXcxEjAQBgNVBAoMCVNub3dmbGFrZTEQMA4GA1UECwwHRHJpdmVyczEf
5+
MB0GA1UEAwwWU25vd2ZsYWtlIHRlc3QgUm9vdCBDQTAeFw0yNTAzMDYxMjM1MjJa
6+
Fw0yNjAzMDYxMjM1MjJaMG4xCzAJBgNVBAYTAlBMMRQwEgYDVQQIDAtNYXpvd2ll
7+
Y2tpZTEPMA0GA1UEBwwGV2Fyc2F3MRIwEAYDVQQKDAlTbm93Zmxha2UxEDAOBgNV
8+
BAsMB0RyaXZlcnMxEjAQBgNVBAMMCWxvY2FsaG9zdDBZMBMGByqGSM49AgEGCCqG
9+
SM49AwEHA0IABF949+w2wCqDugsJ9E7KDHLFVxBedpQ2trRB19pDKMSxMROHIAYq
10+
T8h4MDRG5XwG2gNXgtN38rSWcNMHdPBrwPmjazBpMB8GA1UdIwQYMBaAFNBlcqId
11+
rN8OSmvMp5ZbwKR7RYegMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMA8GA1UdEQQI
12+
MAaHBH8AAAEwHQYDVR0OBBYEFAW3l1QNa8LwvTdTAx9NuD03gHZPMA0GCSqGSIb3
13+
DQEBCwUAA4ICAQAbH3Wbh9GHfb0DEKXvgzNrLExh5l4qo/1RGio7+WqdE3LMBGbH
14+
SF/Y7+Kz+m8PxkuxUKNtRT7JxQjRLwGWHjXpowtuc/JoTOw/1pzMmpJaDsMzhjiw
15+
JhGqGwBy9yqX0524ek/IuMxmZT1rvTjCtFndlQmp5W3nHLt0cwHJC4mUzBI0vyDR
16+
29RKch+q01APLwZQBp+HwL95K+e1iXBs/kViYLXvtC2Vhw/caZwYNzZKM/HEjHdM
17+
5XUkklX9UA08G1xbt4uRjugnXBWMYkQyoivTl+DmOIeEQAzymLZzQUZr0fwMoeBK
18+
mYMjBjzxCZFqJyx3I2e+0hxBXURviGJZhYN53TzEIbaXD/XC8c/FulQ9+EEhw6mZ
19+
BhRJ5jTWV1i4puPZDAnDaR9VtftF0KdIFDG4kQpP3VG/oMYGXrRpA3LYLCy80oCr
20+
kbIOPFMeVLUooeRMG7mgNmAYLWuWxPPSxpB8f3ID0n+wvdeMgAacNYuCRU0NV2CN
21+
XhVpH7jKP7q6th63ICwKpUI5wCl8fqoqwK35NqqZdbyfK1RAL/MlNLlmP1WvEesb
22+
K8x0PDpHxWA3AVf+DPlByBPKLfbnQmZ7siLmfwQyyNWw012ECzP4tmdCP5I+uih4
23+
YeAMw2hQ4C53XjoDEp50gq0WHBcvgWagKP+oRD9oTtwHs1NEWU4EAst5Zg==
24+
-----END CERTIFICATE-----

‎ci/scripts/wiremock-ecdsa.csr

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-----BEGIN CERTIFICATE REQUEST-----
2+
MIIBJzCB0AIBADBuMQswCQYDVQQGEwJQTDEUMBIGA1UECAwLTWF6b3dpZWNraWUx
3+
DzANBgNVBAcMBldhcnNhdzESMBAGA1UECgwJU25vd2ZsYWtlMRAwDgYDVQQLDAdE
4+
cml2ZXJzMRIwEAYDVQQDDAlsb2NhbGhvc3QwWTATBgcqhkjOPQIBBggqhkjOPQMB
5+
BwNCAARfePfsNsAqg7oLCfROygxyxVcQXnaUNra0QdfaQyjEsTEThyAGKk/IeDA0
6+
RuV8BtoDV4LTd/K0lnDTB3Twa8D5oAAwCgYIKoZIzj0EAwIDRgAwQwIfRCKhyzAm
7+
JTJjDCHPT+MYDwnPDuxvSnuJ3MRspW18ZAIgQDEOowXcfkoB4flhxnwxY+UMLn4h
8+
MDCOjAbVcJQFGVE=
9+
-----END CERTIFICATE REQUEST-----

‎ci/scripts/wiremock-ecdsa.key

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-----BEGIN EC PRIVATE KEY-----
2+
MHcCAQEEIOSKn4RQ5lJbhkMaZpofTq+8T3U1F4JlNAOJDom4fbAFoAoGCCqGSM49
3+
AwEHoUQDQgAEX3j37DbAKoO6Cwn0TsoMcsVXEF52lDa2tEHX2kMoxLExE4cgBipP
4+
yHgwNEblfAbaA1eC03fytJZw0wd08GvA+Q==
5+
-----END EC PRIVATE KEY-----

‎ci/scripts/wiremock-ecdsa.p12

1.69 KB
Binary file not shown.

‎wiremock_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ func TestQueryViaHttps(t *testing.T) {
172172
testCertPool.AddCert(certificate)
173173
cfg.Transporter = &http.Transport{
174174
TLSClientConfig: &tls.Config{
175-
RootCAs: testCertPool,
175+
RootCAs: testCertPool,
176+
VerifyPeerCertificate: verifyPeerCertificateSerial,
176177
},
177178
}
178179
connector := NewConnector(SnowflakeDriver{}, *cfg)

0 commit comments

Comments
 (0)