Skip to content

Commit 5b23d1a

Browse files
jinseopkim0jinseopkim0
committed
fix: quickstart env variables
1 parent 8c7fb15 commit 5b23d1a

File tree

4 files changed

+308
-43
lines changed

4 files changed

+308
-43
lines changed

‎bazel/curl.BUILD‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ CURL_WIN_COPTS = [
145145
"/DCURL_DISABLE_PROXY",
146146
"/DHAVE_LIBZ",
147147
"/DHAVE_ZLIB_H",
148+
"/DUSE_OPENSSL", # UPDATED: Enable OpenSSL interface
149+
"/DHAVE_BORINGSSL", # UPDATED: Explicitly define BoringSSL
148150
# Defining _USING_V110_SDK71_ is hackery to defeat curl's incorrect
149151
# detection of what OS releases we can build on with VC 2012. This
150152
# may not be needed (or may have to change) if the WINVER setting
@@ -157,8 +159,7 @@ CURL_WIN_SRCS = [
157159
"lib/inet_ntop.c",
158160
"lib/system_win32.c",
159161
"lib/x509asn1.c",
160-
"lib/vtls/schannel.c",
161-
"lib/vtls/schannel_verify.c",
162+
"lib/vtls/openssl.c", # UPDATED: Use OpenSSL/BoringSSL impl
162163
"lib/idn_win32.c",
163164
]
164165

@@ -455,12 +456,8 @@ cc_library(
455456
":define-ca-bundle-location",
456457
"@com_github_cares_cares//:ares",
457458
"@zlib",
458-
] + select({
459-
":windows": [],
460-
"//conditions:default": [
461-
"@boringssl//:ssl",
462-
],
463-
}),
459+
"@boringssl//:ssl", # UPDATED: Always link BoringSSL (even on Windows)
460+
],
464461
)
465462

466463
write_file(
@@ -484,7 +481,6 @@ write_file(
484481
"# define BUILDING_LIBCURL 1",
485482
"# define CURL_DISABLE_CRYPTO_AUTH 1",
486483
"# define CURL_DISABLE_DICT 1",
487-
"# define CURL_DISABLE_FILE 1",
488484
"# define CURL_DISABLE_GOPHER 1",
489485
"# define CURL_DISABLE_IMAP 1",
490486
"# define CURL_DISABLE_LDAP 1",
@@ -495,9 +491,15 @@ write_file(
495491
"# define CURL_DISABLE_TELNET 1",
496492
"# define CURL_DISABLE_TFTP 1",
497493
"# define CURL_PULL_WS2TCPIP_H 1",
498-
"# define USE_WINDOWS_SSPI 1",
494+
"# define USE_OPENSSL 1", // UPDATED: Added
495+
"# define HAVE_BORINGSSL 1", // UPDATED: Added
496+
"# define HAVE_LIBSSL 1", // UPDATED: Added
497+
"# define HAVE_OPENSSL_SSL_H 1", // UPDATED: Added
498+
"# define HAVE_OPENSSL_CRYPTO_H 1",// UPDATED: Added
499+
"# define HAVE_OPENSSL_PEM_H 1", // UPDATED: Added
500+
"# define HAVE_OPENSSL_X509_H 1", // UPDATED: Added
501+
"# define HAVE_OPENSSL_ERR_H 1", // UPDATED: Added
499502
"# define USE_WIN32_IDN 1",
500-
"# define USE_SCHANNEL 1",
501503
"# define WANT_IDN_PROTOTYPES 1",
502504
"#elif defined(__APPLE__)",
503505
"# define HAVE_FSETXATTR_6 1",
@@ -543,7 +545,6 @@ write_file(
543545
"",
544546
"#if !defined(_WIN32)",
545547
"# define CURL_DISABLE_DICT 1",
546-
"# define CURL_DISABLE_FILE 1",
547548
"# define CURL_DISABLE_GOPHER 1",
548549
"# define CURL_DISABLE_IMAP 1",
549550
"# define CURL_DISABLE_LDAP 1",

‎ci/kokoro/windows/builds/bazel.ps1‎

Lines changed: 136 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# you may not use this file except in compliance with the License.
77
# You may obtain a copy of the License at
88
#
9-
# https://www.apache.org/licenses/LICENSE-2.0
9+
# https://www.apache.org/licenses/LICENSE-2.0
1010
#
1111
# Unless required by applicable law or agreed to in writing, software
1212
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -62,32 +62,151 @@ if ($LastExitCode) {
6262
. ci/kokoro/windows/lib/integration.ps1
6363

6464
function Invoke-REST-Quickstart {
65-
bazelisk $common_flags run $build_flags `
66-
//google/cloud/storage/quickstart:quickstart -- `
67-
"${env:GOOGLE_CLOUD_CPP_STORAGE_TEST_BUCKET_NAME}"
68-
if ($LastExitCode) {
69-
Write-Host -ForegroundColor Red "bazel run (storage/quickstart) failed with exit code ${LastExitCode}."
70-
Exit ${LastExitCode}
65+
param($bazel_bin)
66+
try {
67+
$executable = Join-Path $bazel_bin "google/cloud/storage/quickstart/quickstart.exe"
68+
Write-Host "Running REST Quickstart, attempting to run: $executable"
69+
if (-not (Test-Path $executable)) {
70+
Write-Host -ForegroundColor Red "Executable not found at the specified path."
71+
Exit 1
72+
}
73+
& $executable "${env:GOOGLE_CLOUD_CPP_STORAGE_TEST_BUCKET_NAME}"
74+
if ($LastExitCode) {
75+
Write-Host -ForegroundColor Red "Execution of (storage/quickstart) failed with exit code ${LastExitCode}."
76+
Exit ${LastExitCode}
77+
}
78+
} catch {
79+
Write-Host -ForegroundColor Red "Caught exception while trying to run storage/quickstart: $_"
80+
Exit 1
7181
}
7282
}
7383

7484
function Invoke-gRPC-Quickstart {
75-
bazelisk $common_flags run $build_flags `
76-
//google/cloud/pubsub/quickstart:quickstart -- `
77-
"${env:GOOGLE_CLOUD_PROJECT}" "${env:GOOGLE_CLOUD_CPP_PUBSUB_TEST_QUICKSTART_TOPIC}"
78-
if ($LastExitCode) {
79-
Write-Host -ForegroundColor Red "bazel run (pubsub/quickstart) failed with exit code ${LastExitCode}."
80-
Exit ${LastExitCode}
85+
param($bazel_bin)
86+
try {
87+
$executable = Join-Path $bazel_bin "google/cloud/pubsub/quickstart/quickstart.exe"
88+
Write-Host "Running gRPC Quickstart, attempting to run: $executable"
89+
if (-not (Test-Path $executable)) {
90+
Write-Host -ForegroundColor Red "Executable not found at the specified path."
91+
Exit 1
92+
}
93+
& $executable "${env:GOOGLE_CLOUD_PROJECT}" "${env:GOOGLE_CLOUD_CPP_PUBSUB_TEST_QUICKSTART_TOPIC}"
94+
if ($LastExitCode) {
95+
Write-Host -ForegroundColor Red "Execution of (pubsub/quickstart) failed with exit code ${LastExitCode}."
96+
Exit ${LastExitCode}
97+
}
98+
} catch {
99+
Write-Host -ForegroundColor Red "Caught exception while trying to run pubsub/quickstart: $_"
100+
Exit 1
81101
}
82102
}
83103

84104
if (Test-Integration-Enabled) {
85105
Write-Host "`n$(Get-Date -Format o) Running minimal quickstart prorams"
106+
107+
# 1. Install the certificates
86108
Install-Roots-Pem
87-
${env:GRPC_DEFAULT_SSL_ROOTS_FILE_PATH}="${env:KOKORO_GFILE_DIR}/roots.pem"
88-
${env:GOOGLE_APPLICATION_CREDENTIALS}="${env:KOKORO_GFILE_DIR}/kokoro-run-key.json"
89-
Invoke-REST-Quickstart
90-
Invoke-gRPC-Quickstart
109+
110+
# 2. Normalize paths to use Forward Slashes (/)
111+
# This is critical for C++ binaries (BoringSSL/libcurl) to parse paths correctly on Windows.
112+
$RawRootsPath = Join-Path $env:KOKORO_GFILE_DIR "roots.pem"
113+
$RootsPath = $RawRootsPath -replace '\\', '/'
114+
115+
$RawKeyPath = Join-Path $env:KOKORO_GFILE_DIR "kokoro-run-key.json"
116+
$KeyPath = $RawKeyPath -replace '\\', '/'
117+
118+
# 3. Set ALL SSL Environment Variables
119+
# OpenSSL/BoringSSL may look at SSL_CERT_FILE before CURL_CA_BUNDLE
120+
# Use Forward Slashes ($RootsPath) for BoringSSL
121+
$env:GRPC_DEFAULT_SSL_ROOTS_FILE_PATH = $RootsPath
122+
$env:CURL_CA_BUNDLE = $RootsPath
123+
$env:SSL_CERT_FILE = $RootsPath
124+
$env:GOOGLE_APPLICATION_CREDENTIALS = $KeyPath
125+
126+
# 4. Enable Deep Library Logging
127+
$env:GOOGLE_CLOUD_CPP_ENABLE_TRACING="http"
128+
$env:CURL_VERBOSE="1"
129+
130+
# --- DEBUG CHECKS ---
131+
Write-Host -ForegroundColor Cyan "`n--- DEBUG: Environment & File Check ---"
132+
Write-Host "Roots Path: $RootsPath"
133+
134+
Write-Host "`n[Check 1] Environment Variables:"
135+
Get-ChildItem Env: | Where-Object { $_.Name -match 'CURL_|GOOGLE_|GRPC_|SSL_' } | Format-Table -AutoSize | Out-Host
136+
137+
Write-Host "`n[Check 2] File Verify:"
138+
if (Test-Path $RootsPath) {
139+
Write-Host -ForegroundColor Green "File exists."
140+
Get-Item $RootsPath | Select-Object Length, LastWriteTime
141+
} else {
142+
Write-Host -ForegroundColor Red "CRITICAL: File not found at $RootsPath"
143+
}
144+
Write-Host "--- DEBUG END ---`n"
145+
146+
bazelisk $common_flags build $build_flags `
147+
//google/cloud/storage/quickstart:quickstart `
148+
//google/cloud/pubsub/quickstart:quickstart
149+
150+
$bazel_bin = (bazelisk $common_flags info $build_flags bazel-bin).Trim()
151+
# Fix bazel-bin path for PowerShell invocation just in case
152+
$bazel_bin = $bazel_bin.Replace('/', '\')
153+
Write-Host "bazel-bin directory: $bazel_bin"
154+
155+
# --- VERIFICATION EXPERIMENT START ---
156+
Write-Host -ForegroundColor Cyan "`n--- EXPERIMENT: The 'Strip & Retry' Test ---"
157+
158+
# Define paths
159+
$DirtyFile = $RawRootsPath
160+
$CleanFile = Join-Path $env:KOKORO_GFILE_DIR "roots_clean.pem"
161+
$CleanFileForward = $CleanFile -replace '\\', '/'
162+
163+
# Check for the "Poison" (\r)
164+
$text = [System.IO.File]::ReadAllText($DirtyFile)
165+
if ($text.Contains("`r")) {
166+
Write-Host -ForegroundColor Red "[CONFIRMED] 'roots.pem' contains Carriage Returns (\r)."
167+
Write-Host " Attempting to sanitize and run binary..."
168+
169+
# Create the Antidote (Remove all \r)
170+
$cleanText = $text.Replace("`r", "")
171+
[System.IO.File]::WriteAllText($CleanFile, $cleanText)
172+
Write-Host "Created sanitized file: $CleanFileForward"
173+
174+
# Run the Binary against the CLEAN file
175+
Write-Host "`nRunning quickstart.exe using CLEAN file..."
176+
177+
# Temporarily override the env var just for this test
178+
$env:CURL_CA_BUNDLE = $CleanFileForward
179+
$env:SSL_CERT_FILE = $CleanFileForward
180+
$env:GRPC_DEFAULT_SSL_ROOTS_FILE_PATH = $CleanFileForward
181+
182+
# Construct executable path
183+
$QuickstartExe = Join-Path $bazel_bin "google/cloud/storage/quickstart/quickstart.exe"
184+
185+
try {
186+
& $QuickstartExe "${env:GOOGLE_CLOUD_CPP_STORAGE_TEST_BUCKET_NAME}"
187+
if ($LastExitCode -eq 0) {
188+
Write-Host -ForegroundColor Green "`n[SUCCESS] The binary worked with the clean file!"
189+
Write-Host -ForegroundColor Green "CONCLUSION: Carriage Returns were the root cause."
190+
} else {
191+
Write-Host -ForegroundColor Red "`n[FAILURE] The binary still failed ($LastExitCode) even with the clean file."
192+
Write-Host -ForegroundColor Red "CONCLUSION: The issue is NOT carriage returns."
193+
}
194+
} catch {
195+
Write-Host "Execution failed: $_"
196+
}
197+
198+
# Restore Env Vars for standard test flow
199+
$env:CURL_CA_BUNDLE = $RootsPath
200+
$env:SSL_CERT_FILE = $RootsPath
201+
$env:GRPC_DEFAULT_SSL_ROOTS_FILE_PATH = $RootsPath
202+
} else {
203+
Write-Host -ForegroundColor Green "[INFO] 'roots.pem' is already clean (No \r). Experiment skipped."
204+
}
205+
Write-Host "------------------------------------------------"
206+
# --- VERIFICATION EXPERIMENT END ---
207+
208+
Invoke-REST-Quickstart $bazel_bin
209+
Invoke-gRPC-Quickstart $bazel_bin
91210
}
92211

93212
# Shutdown the Bazel server to release any locks

0 commit comments

Comments
 (0)