更新认证关键字
This commit is contained in:
parent
753078d345
commit
30a901b13d
@ -70,7 +70,7 @@ description: 基于 PAM HOME/NODE 流程执行软件发布、下载、升级、
|
|||||||
|
|
||||||
调用 NODE 侧接口时,始终携带:
|
调用 NODE 侧接口时,始终携带:
|
||||||
|
|
||||||
- `Authorization: Basic {TOKEN}`
|
- `Authorization: Bearer {TOKEN}`
|
||||||
- `Target-Node: {NODE_URL}`
|
- `Target-Node: {NODE_URL}`
|
||||||
- `airport-code: {airportCode}`,仅在下载到 NODE 等需要时携带
|
- `airport-code: {airportCode}`,仅在下载到 NODE 等需要时携带
|
||||||
|
|
||||||
|
|||||||
@ -165,7 +165,7 @@ http_request() {
|
|||||||
local curl_cmd="curl -X ${method} '${url}'"
|
local curl_cmd="curl -X ${method} '${url}'"
|
||||||
|
|
||||||
# 添加认证头
|
# 添加认证头
|
||||||
curl_cmd="${curl_cmd} -H 'Authorization: Basic ${TOKEN}'"
|
curl_cmd="${curl_cmd} -H 'Authorization: Bearer ${TOKEN}'"
|
||||||
|
|
||||||
# 添加额外 headers
|
# 添加额外 headers
|
||||||
if [ -n "$headers" ]; then
|
if [ -n "$headers" ]; then
|
||||||
@ -190,7 +190,7 @@ upload_file() {
|
|||||||
local file_path=$2
|
local file_path=$2
|
||||||
local form_data=$3
|
local form_data=$3
|
||||||
|
|
||||||
local curl_cmd="curl -X POST '${url}' -H 'Authorization: Basic ${TOKEN}'"
|
local curl_cmd="curl -X POST '${url}' -H 'Authorization: Bearer ${TOKEN}'"
|
||||||
|
|
||||||
# 添加 form 字段
|
# 添加 form 字段
|
||||||
IFS='&' read -ra FORM_ARRAY <<< "$form_data"
|
IFS='&' read -ra FORM_ARRAY <<< "$form_data"
|
||||||
@ -609,11 +609,11 @@ if defined EXTRA_HEADERS (
|
|||||||
:: 对于 HTTP 请求,如果数据中包含特殊字符,直接使用 PowerShell 的 Invoke-RestMethod 或 Invoke-WebRequest 更可靠
|
:: 对于 HTTP 请求,如果数据中包含特殊字符,直接使用 PowerShell 的 Invoke-RestMethod 或 Invoke-WebRequest 更可靠
|
||||||
:: 这里为了保持与 Batch 逻辑的一致性,我们使用 curl 但通过 PowerShell 调用 curl 以保留 stderr
|
:: 这里为了保持与 Batch 逻辑的一致性,我们使用 curl 但通过 PowerShell 调用 curl 以保留 stderr
|
||||||
if defined OUTPUT_FILE (
|
if defined OUTPUT_FILE (
|
||||||
powershell -Command "curl.exe -X '%METHOD%' '%URL%' -H 'Authorization: Basic %TOKEN%'" > "%OUTPUT_FILE%" 2>"%ERROR_FILE%"
|
powershell -Command "curl.exe -X '%METHOD%' '%URL%' -H 'Authorization: Bearer %TOKEN%'" > "%OUTPUT_FILE%" 2>"%ERROR_FILE%"
|
||||||
:: 注意:如果 DATA 非空,需要重新构造命令。为了简化,我们假设大部分 POST 数据是简单的 form-urlencoded,且不含极端特殊字符,或者使用 PowerShell 内部变量传递。
|
:: 注意:如果 DATA 非空,需要重新构造命令。为了简化,我们假设大部分 POST 数据是简单的 form-urlencoded,且不含极端特殊字符,或者使用 PowerShell 内部变量传递。
|
||||||
:: **更安全的做法**:对于包含复杂 Data 的请求,直接使用 PowerShell。
|
:: **更安全的做法**:对于包含复杂 Data 的请求,直接使用 PowerShell。
|
||||||
) else (
|
) else (
|
||||||
curl -X %METHOD% '%URL%' -H 'Authorization: Basic %TOKEN%' 2>&1
|
curl -X %METHOD% '%URL%' -H 'Authorization: Bearer %TOKEN%' 2>&1
|
||||||
)
|
)
|
||||||
|
|
||||||
:: *修正*:为了确保所有请求(特别是带 DATA 的)都能正确处理特殊字符,我们将核心请求逻辑交给 PowerShell 执行,或者确保 curl 命令被正确转义。
|
:: *修正*:为了确保所有请求(特别是带 DATA 的)都能正确处理特殊字符,我们将核心请求逻辑交给 PowerShell 执行,或者确保 curl 命令被正确转义。
|
||||||
|
|||||||
@ -204,7 +204,7 @@ function Invoke-PamWebRequest {
|
|||||||
|
|
||||||
$allHeaders = @{}
|
$allHeaders = @{}
|
||||||
if ($Token) {
|
if ($Token) {
|
||||||
$allHeaders['Authorization'] = "Basic $Token"
|
$allHeaders['Authorization'] = "Bearer $Token"
|
||||||
}
|
}
|
||||||
foreach ($key in $Headers.Keys) {
|
foreach ($key in $Headers.Keys) {
|
||||||
$allHeaders[$key] = $Headers[$key]
|
$allHeaders[$key] = $Headers[$key]
|
||||||
@ -258,7 +258,7 @@ function Invoke-PamMultipartUpload {
|
|||||||
$client = [System.Net.Http.HttpClient]::new()
|
$client = [System.Net.Http.HttpClient]::new()
|
||||||
try {
|
try {
|
||||||
$client.DefaultRequestHeaders.Authorization =
|
$client.DefaultRequestHeaders.Authorization =
|
||||||
[System.Net.Http.Headers.AuthenticationHeaderValue]::new('Basic', $Token)
|
[System.Net.Http.Headers.AuthenticationHeaderValue]::new('Bearer', $Token)
|
||||||
|
|
||||||
$content = [System.Net.Http.MultipartFormDataContent]::new()
|
$content = [System.Net.Http.MultipartFormDataContent]::new()
|
||||||
foreach ($entry in $Fields.GetEnumerator()) {
|
foreach ($entry in $Fields.GetEnumerator()) {
|
||||||
|
|||||||
@ -84,7 +84,7 @@ mask_sensitive_text() {
|
|||||||
|
|
||||||
text="$(printf '%s' "$text" | sed -E \
|
text="$(printf '%s' "$text" | sed -E \
|
||||||
-e 's/(client_secret=)[^&[:space:]]+/\1***MASKED***/g' \
|
-e 's/(client_secret=)[^&[:space:]]+/\1***MASKED***/g' \
|
||||||
-e 's/(Authorization: Basic )[^\r\n]+/\1***MASKED***/g' \
|
-e 's/(Authorization: (Basic|Bearer) )[^\r\n]+/\1***MASKED***/g' \
|
||||||
-e 's/("access_token"[[:space:]]*:[[:space:]]*")[^"]+/\1***MASKED***/g' \
|
-e 's/("access_token"[[:space:]]*:[[:space:]]*")[^"]+/\1***MASKED***/g' \
|
||||||
-e 's/("client_secret"[[:space:]]*:[[:space:]]*")[^"]+/\1***MASKED***/g')"
|
-e 's/("client_secret"[[:space:]]*:[[:space:]]*")[^"]+/\1***MASKED***/g')"
|
||||||
|
|
||||||
@ -428,8 +428,8 @@ http_request() {
|
|||||||
cmd=(curl -sS -X "$method" "$url")
|
cmd=(curl -sS -X "$method" "$url")
|
||||||
|
|
||||||
if [[ -n "$TOKEN" ]]; then
|
if [[ -n "$TOKEN" ]]; then
|
||||||
cmd+=(-H "Authorization: Basic ${TOKEN}")
|
cmd+=(-H "Authorization: Bearer ${TOKEN}")
|
||||||
headers_text+="Authorization: Basic ${TOKEN}"$'\n'
|
headers_text+="Authorization: Bearer ${TOKEN}"$'\n'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "$content_type" ]]; then
|
if [[ -n "$content_type" ]]; then
|
||||||
@ -493,8 +493,8 @@ upload_file() {
|
|||||||
cmd=(curl -sS -X POST "$url")
|
cmd=(curl -sS -X POST "$url")
|
||||||
|
|
||||||
if [[ -n "$TOKEN" ]]; then
|
if [[ -n "$TOKEN" ]]; then
|
||||||
cmd+=(-H "Authorization: Basic ${TOKEN}")
|
cmd+=(-H "Authorization: Bearer ${TOKEN}")
|
||||||
fields_text+="Authorization: Basic ${TOKEN}"$'\n'
|
fields_text+="Authorization: Bearer ${TOKEN}"$'\n'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cmd+=(-F "file=@${file_path}")
|
cmd+=(-F "file=@${file_path}")
|
||||||
@ -738,11 +738,11 @@ download_log() {
|
|||||||
mkdir -p "$logs_dir"
|
mkdir -p "$logs_dir"
|
||||||
next_trace_id
|
next_trace_id
|
||||||
request_id="$CURRENT_TRACE_ID"
|
request_id="$CURRENT_TRACE_ID"
|
||||||
trace_request "$request_id" "GET" "$trace_url" "Authorization: Basic ${TOKEN}"$'\n'"Target-Node: ${NODE_URL}" ""
|
trace_request "$request_id" "GET" "$trace_url" "Authorization: Bearer ${TOKEN}"$'\n'"Target-Node: ${NODE_URL}" ""
|
||||||
|
|
||||||
if curl -sS -X GET \
|
if curl -sS -X GET \
|
||||||
"$trace_url" \
|
"$trace_url" \
|
||||||
-H "Authorization: Basic ${TOKEN}" \
|
-H "Authorization: Bearer ${TOKEN}" \
|
||||||
-H "Target-Node: ${NODE_URL}" \
|
-H "Target-Node: ${NODE_URL}" \
|
||||||
-o "$log_file" \
|
-o "$log_file" \
|
||||||
-w '%{http_code}' > "${err_file}.code" 2>"$err_file"; then
|
-w '%{http_code}' > "${err_file}.code" 2>"$err_file"; then
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user