mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-18 22:16:18 -05:00
Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a708ce0115 | ||
|
|
02cf4a0b26 | ||
|
|
370189cbee | ||
|
|
6746cf64c3 | ||
|
|
40739739b5 | ||
|
|
dc7a200b93 | ||
|
|
f49b6471f3 |
No files matched your search
@@ -130,6 +130,7 @@ jobs:
|
|||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
build-gp:
|
build-gp:
|
||||||
|
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
||||||
needs:
|
needs:
|
||||||
- tarball
|
- tarball
|
||||||
strategy:
|
strategy:
|
||||||
@@ -153,19 +154,17 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
name: artifact-source
|
name: artifact-source
|
||||||
path: build-gp-${{ matrix.package }}
|
path: build-gp-${{ matrix.package }}
|
||||||
- name: Docker Login
|
|
||||||
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
|
||||||
- name: Build ${{ matrix.package }} package in Docker
|
- name: Build ${{ matrix.package }} package in Docker
|
||||||
# LIBXML2_STATIC is needed to avoid the dynamic linking issue on different distros
|
# LIBXML2_STATIC is needed to avoid the dynamic linking issue on different distros
|
||||||
run: |
|
run: |
|
||||||
docker run --pull=always --rm \
|
docker run --rm \
|
||||||
-e COREPACK_INTEGRITY_KEYS=0 \
|
-e COREPACK_INTEGRITY_KEYS=0 \
|
||||||
-e LIBXML2_STATIC=1 \
|
-e LIBXML2_STATIC=1 \
|
||||||
-v $(pwd)/build-gp-${{ matrix.package }}:/workspace \
|
-v $(pwd)/build-gp-${{ matrix.package }}:/workspace \
|
||||||
yuezk/gpdev:${{ matrix.package }}-builder-tauri2
|
yuezk/gpdev:${{ matrix.package }}-builder-tauri2
|
||||||
- name: Install ${{ matrix.package }} package in Docker
|
- name: Install ${{ matrix.package }} package in Docker
|
||||||
run: |
|
run: |
|
||||||
docker run --pull=always --rm \
|
docker run --rm \
|
||||||
-e COREPACK_INTEGRITY_KEYS=0 \
|
-e COREPACK_INTEGRITY_KEYS=0 \
|
||||||
-e GPGUI_INSTALLED=0 \
|
-e GPGUI_INSTALLED=0 \
|
||||||
-v $(pwd)/build-gp-${{ matrix.package }}:/workspace \
|
-v $(pwd)/build-gp-${{ matrix.package }}:/workspace \
|
||||||
@@ -182,6 +181,7 @@ jobs:
|
|||||||
build-gp-${{ matrix.package }}/artifacts/*
|
build-gp-${{ matrix.package }}/artifacts/*
|
||||||
|
|
||||||
build-docker-image:
|
build-docker-image:
|
||||||
|
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -282,18 +282,16 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cd gpgui-source
|
cd gpgui-source
|
||||||
tar -czf gpgui.tar.gz gpgui gp
|
tar -czf gpgui.tar.gz gpgui gp
|
||||||
- name: Docker Login
|
|
||||||
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
|
||||||
- name: Build gpgui in Docker
|
- name: Build gpgui in Docker
|
||||||
run: |
|
run: |
|
||||||
docker run --pull=always --rm \
|
docker run --rm \
|
||||||
-e COREPACK_INTEGRITY_KEYS=0 \
|
-e COREPACK_INTEGRITY_KEYS=0 \
|
||||||
-v $(pwd)/gpgui-source:/workspace yuezk/gpdev:${{ matrix.libc.builder }}
|
-v $(pwd)/gpgui-source:/workspace yuezk/gpdev:${{ matrix.libc.builder }}
|
||||||
- name: Install gpgui in Docker
|
- name: Install gpgui in Docker
|
||||||
run: |
|
run: |
|
||||||
cd gpgui-source
|
cd gpgui-source
|
||||||
tar -xJf *.bin.tar.xz
|
tar -xJf *.bin.tar.xz
|
||||||
docker run --pull=always --rm \
|
docker run --rm \
|
||||||
-e COREPACK_INTEGRITY_KEYS=0 \
|
-e COREPACK_INTEGRITY_KEYS=0 \
|
||||||
-v $(pwd):/workspace yuezk/gpdev:${{ matrix.libc.builder }} \
|
-v $(pwd):/workspace yuezk/gpdev:${{ matrix.libc.builder }} \
|
||||||
bash -c "cd /workspace/gpgui_*/ && ./gpgui --version"
|
bash -c "cd /workspace/gpgui_*/ && ./gpgui --version"
|
||||||
@@ -306,58 +304,6 @@ jobs:
|
|||||||
gpgui-source/*.bin.tar.xz
|
gpgui-source/*.bin.tar.xz
|
||||||
gpgui-source/*.bin.tar.xz.sha256
|
gpgui-source/*.bin.tar.xz.sha256
|
||||||
|
|
||||||
build-nix-prebuilt:
|
|
||||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- runner: ubuntu-latest
|
|
||||||
nixpkgs: nixos-25.11
|
|
||||||
- runner: ubuntu-latest
|
|
||||||
nixpkgs: nixos-26.05
|
|
||||||
- runner: ubuntu-24.04-arm
|
|
||||||
nixpkgs: nixos-25.11
|
|
||||||
- runner: ubuntu-24.04-arm
|
|
||||||
nixpkgs: nixos-26.05
|
|
||||||
name: build-nix-prebuilt (${{ matrix.nixpkgs }}, ${{ matrix.runner }})
|
|
||||||
runs-on: ${{ matrix.runner }}
|
|
||||||
steps:
|
|
||||||
- name: Checkout GlobalProtect-openconnect
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_PAT }}
|
|
||||||
repository: yuezk/GlobalProtect-openconnect
|
|
||||||
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref }}
|
|
||||||
submodules: recursive
|
|
||||||
|
|
||||||
- name: Install Nix
|
|
||||||
uses: cachix/install-nix-action@v31
|
|
||||||
|
|
||||||
- name: Build prebuilt Nix package
|
|
||||||
run: |
|
|
||||||
nix build .#prebuilt \
|
|
||||||
--override-input nixpkgs "github:NixOS/nixpkgs/${{ matrix.nixpkgs }}" \
|
|
||||||
--extra-experimental-features "nix-command flakes" \
|
|
||||||
--print-build-logs
|
|
||||||
|
|
||||||
- name: Inspect prebuilt Nix package
|
|
||||||
run: |
|
|
||||||
test -x result/bin/gpclient
|
|
||||||
test -x result/bin/gpauth
|
|
||||||
test -x result/bin/gpservice
|
|
||||||
test -x result/bin/gpgui-helper
|
|
||||||
test -x result/bin/gpgui
|
|
||||||
test ! -L result/bin/gpservice
|
|
||||||
head -n1 result/bin/gpclient | grep '^#!'
|
|
||||||
head -n1 result/bin/gpservice | grep '^#!'
|
|
||||||
grep -q '/run/wrappers/bin/pkexec' result/bin/gpclient
|
|
||||||
grep -q 'gpservice_public=.*/bin/gpservice' result/bin/gpclient
|
|
||||||
grep -q 'exec .*/bin/gpservice' result/bin/gpservice
|
|
||||||
! grep -q '@gpservice_public@\|@gpservice_fhs@\|\$out/bin/gpservice' result/bin/gpclient result/bin/gpservice
|
|
||||||
|
|
||||||
! grep -R '/usr/bin/gp' result/share
|
|
||||||
|
|
||||||
setup-bsd-matrix:
|
setup-bsd-matrix:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
@@ -600,6 +546,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
NEEDS_JSON: ${{ toJson(needs) }}
|
NEEDS_JSON: ${{ toJson(needs) }}
|
||||||
BSD_MATRIX_ENABLED: ${{ needs.setup-bsd-matrix.outputs.enabled }}
|
BSD_MATRIX_ENABLED: ${{ needs.setup-bsd-matrix.outputs.enabled }}
|
||||||
|
IS_TAG: ${{ startsWith(github.ref, 'refs/tags/') }}
|
||||||
run: |
|
run: |
|
||||||
python3 - <<'PY'
|
python3 - <<'PY'
|
||||||
import json
|
import json
|
||||||
@@ -608,12 +555,15 @@ jobs:
|
|||||||
|
|
||||||
needs = json.loads(os.environ["NEEDS_JSON"])
|
needs = json.loads(os.environ["NEEDS_JSON"])
|
||||||
bsd_matrix_enabled = os.environ["BSD_MATRIX_ENABLED"] == "true"
|
bsd_matrix_enabled = os.environ["BSD_MATRIX_ENABLED"] == "true"
|
||||||
|
is_tag = os.environ["IS_TAG"] == "true"
|
||||||
failed = []
|
failed = []
|
||||||
|
|
||||||
for name, data in needs.items():
|
for name, data in needs.items():
|
||||||
result = data["result"]
|
result = data["result"]
|
||||||
if result in {"failure", "cancelled"}:
|
if result in {"failure", "cancelled"}:
|
||||||
failed.append(f"{name}: {result}")
|
failed.append(f"{name}: {result}")
|
||||||
|
elif name in {"build-gp", "build-docker-image"} and result == "skipped" and is_tag:
|
||||||
|
continue
|
||||||
elif name in {"build-gpgui-frontend", "build-bsd"} and result == "skipped" and not bsd_matrix_enabled:
|
elif name in {"build-gpgui-frontend", "build-bsd"} and result == "skipped" and not bsd_matrix_enabled:
|
||||||
continue
|
continue
|
||||||
elif result == "skipped":
|
elif result == "skipped":
|
||||||
|
|||||||
@@ -116,12 +116,10 @@ jobs:
|
|||||||
--pattern '*[^offline].tar.gz' \
|
--pattern '*[^offline].tar.gz' \
|
||||||
--dir build-${{ matrix.package }}
|
--dir build-${{ matrix.package }}
|
||||||
|
|
||||||
- name: Docker Login
|
|
||||||
run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
|
|
||||||
- name: Build ${{ matrix.package }} package in Docker
|
- name: Build ${{ matrix.package }} package in Docker
|
||||||
# LIBXML2_STATIC is needed to avoid the dynamic linking issue on different distros
|
# LIBXML2_STATIC is needed to avoid the dynamic linking issue on different distros
|
||||||
run: |
|
run: |
|
||||||
docker run --pull=always --rm \
|
docker run --rm \
|
||||||
-v $(pwd)/build-${{ matrix.package }}:/workspace \
|
-v $(pwd)/build-${{ matrix.package }}:/workspace \
|
||||||
-e COREPACK_INTEGRITY_KEYS=0 \
|
-e COREPACK_INTEGRITY_KEYS=0 \
|
||||||
-e LIBXML2_STATIC=1 \
|
-e LIBXML2_STATIC=1 \
|
||||||
@@ -130,7 +128,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Install ${{ matrix.package }} package in Docker
|
- name: Install ${{ matrix.package }} package in Docker
|
||||||
run: |
|
run: |
|
||||||
docker run --pull=always --rm \
|
docker run --rm \
|
||||||
-e COREPACK_INTEGRITY_KEYS=0 \
|
-e COREPACK_INTEGRITY_KEYS=0 \
|
||||||
-v $(pwd)/build-${{ matrix.package }}:/workspace \
|
-v $(pwd)/build-${{ matrix.package }}:/workspace \
|
||||||
yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \
|
yuezk/gpdev:${{ matrix.package }}-builder-tauri2 \
|
||||||
|
|||||||
@@ -31,6 +31,83 @@ jobs:
|
|||||||
scripts/update-flake-hashes.sh
|
scripts/update-flake-hashes.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
- name: Upload updated flake
|
||||||
|
uses: actions/upload-artifact@v7
|
||||||
|
with:
|
||||||
|
name: updated-flake
|
||||||
|
path: flake.nix
|
||||||
|
if-no-files-found: error
|
||||||
|
|
||||||
|
validate-nix-prebuilt:
|
||||||
|
needs:
|
||||||
|
- update-flake-hashes
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- runner: ubuntu-latest
|
||||||
|
nixpkgs: nixos-25.11
|
||||||
|
- runner: ubuntu-latest
|
||||||
|
nixpkgs: nixos-26.05
|
||||||
|
- runner: ubuntu-24.04-arm
|
||||||
|
nixpkgs: nixos-25.11
|
||||||
|
- runner: ubuntu-24.04-arm
|
||||||
|
nixpkgs: nixos-26.05
|
||||||
|
name: validate-nix-prebuilt (${{ matrix.nixpkgs }}, ${{ matrix.runner }})
|
||||||
|
runs-on: ${{ matrix.runner }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout GlobalProtect-openconnect
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
|
- name: Download updated flake
|
||||||
|
uses: actions/download-artifact@v8
|
||||||
|
with:
|
||||||
|
name: updated-flake
|
||||||
|
path: .
|
||||||
|
|
||||||
|
- name: Install Nix
|
||||||
|
uses: cachix/install-nix-action@v31
|
||||||
|
|
||||||
|
- name: Build prebuilt Nix package
|
||||||
|
run: |
|
||||||
|
nix build .#prebuilt \
|
||||||
|
--override-input nixpkgs "github:NixOS/nixpkgs/${{ matrix.nixpkgs }}" \
|
||||||
|
--extra-experimental-features "nix-command flakes" \
|
||||||
|
--print-build-logs
|
||||||
|
|
||||||
|
- name: Inspect prebuilt Nix package
|
||||||
|
run: |
|
||||||
|
test -x result/bin/gpclient
|
||||||
|
test -x result/bin/gpauth
|
||||||
|
test -x result/bin/gpservice
|
||||||
|
test -x result/bin/gpgui-helper
|
||||||
|
test -x result/bin/gpgui
|
||||||
|
test ! -L result/bin/gpservice
|
||||||
|
head -n1 result/bin/gpclient | grep '^#!'
|
||||||
|
head -n1 result/bin/gpservice | grep '^#!'
|
||||||
|
grep -q '/run/wrappers/bin/pkexec' result/bin/gpclient
|
||||||
|
grep -q 'gpservice_public=.*/bin/gpservice' result/bin/gpclient
|
||||||
|
grep -q 'exec .*/bin/gpservice' result/bin/gpservice
|
||||||
|
! grep -q '@gpservice_public@\|@gpservice_fhs@\|\$out/bin/gpservice' result/bin/gpclient result/bin/gpservice
|
||||||
|
|
||||||
|
! grep -R '/usr/bin/gp' result/share
|
||||||
|
|
||||||
|
open-pull-request:
|
||||||
|
needs:
|
||||||
|
- validate-nix-prebuilt
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout GlobalProtect-openconnect
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Download updated flake
|
||||||
|
uses: actions/download-artifact@v8
|
||||||
|
with:
|
||||||
|
name: updated-flake
|
||||||
|
path: .
|
||||||
|
|
||||||
- name: Open pull request
|
- name: Open pull request
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ github.token }}
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
|||||||
Generated
+8
-8
@@ -214,7 +214,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "auth"
|
name = "auth"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"block2",
|
"block2",
|
||||||
@@ -705,7 +705,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "common"
|
name = "common"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "compile-time"
|
name = "compile-time"
|
||||||
@@ -1732,7 +1732,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpapi"
|
name = "gpapi"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
@@ -1776,7 +1776,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpauth"
|
name = "gpauth"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"auth",
|
"auth",
|
||||||
@@ -1796,7 +1796,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpclient"
|
name = "gpclient"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"askama",
|
"askama",
|
||||||
@@ -1825,7 +1825,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpgui-helper"
|
name = "gpgui-helper"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
@@ -1843,7 +1843,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpservice"
|
name = "gpservice"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -3191,7 +3191,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openconnect"
|
name = "openconnect"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autotools",
|
"autotools",
|
||||||
"cc",
|
"cc",
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ members = [
|
|||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
rust-version = "1.89"
|
rust-version = "1.89"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
authors = ["Kevin Yue <[email protected]>"]
|
authors = ["Kevin Yue <[email protected]>"]
|
||||||
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
|
homepage = "https://github.com/yuezk/GlobalProtect-openconnect"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|||||||
+36
-1
@@ -57,6 +57,19 @@ struct Cli {
|
|||||||
#[arg(long, help = "Override the GlobalProtect client version reported to the server")]
|
#[arg(long, help = "Override the GlobalProtect client version reported to the server")]
|
||||||
client_version: Option<String>,
|
client_version: Option<String>,
|
||||||
|
|
||||||
|
#[arg(
|
||||||
|
short,
|
||||||
|
long,
|
||||||
|
help = "Use SSL client certificate file in pkcs#8 (.pem) or pkcs#12 (.p12, .pfx) format"
|
||||||
|
)]
|
||||||
|
certificate: Option<String>,
|
||||||
|
|
||||||
|
#[arg(short = 'k', long, help = "Use SSL private key file in pkcs#8 (.pem) format")]
|
||||||
|
sslkey: Option<String>,
|
||||||
|
|
||||||
|
#[arg(short = 'p', long, help = "The key passphrase of the private key")]
|
||||||
|
key_password: Option<String>,
|
||||||
|
|
||||||
#[arg(long, help = "Get around the OpenSSL `unsafe legacy renegotiation` error")]
|
#[arg(long, help = "Get around the OpenSSL `unsafe legacy renegotiation` error")]
|
||||||
fix_openssl: bool,
|
fix_openssl: bool,
|
||||||
|
|
||||||
@@ -128,7 +141,7 @@ impl Cli {
|
|||||||
|
|
||||||
let auth_request = match self.saml_request.as_deref() {
|
let auth_request = match self.saml_request.as_deref() {
|
||||||
Some(auth_request) => auth_request.to_string(),
|
Some(auth_request) => auth_request.to_string(),
|
||||||
None => auth_prelogin(&server, &gp_params, self.external_browser_requested()).await?,
|
None => auth_prelogin(&server, &gp_params, self.external_browser_requested(), self.gateway).await?,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
@@ -161,6 +174,9 @@ impl Cli {
|
|||||||
fn build_gp_params(&self) -> GpParams {
|
fn build_gp_params(&self) -> GpParams {
|
||||||
GpParams::builder(self.build_os_profile())
|
GpParams::builder(self.build_os_profile())
|
||||||
.ignore_tls_errors(self.ignore_tls_errors)
|
.ignore_tls_errors(self.ignore_tls_errors)
|
||||||
|
.certificate(self.certificate.clone())
|
||||||
|
.sslkey(self.sslkey.clone())
|
||||||
|
.key_password(self.key_password.clone())
|
||||||
.is_gateway(self.gateway)
|
.is_gateway(self.gateway)
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
@@ -276,4 +292,23 @@ mod tests {
|
|||||||
assert_eq!(profile.client_version(), "legacy-client");
|
assert_eq!(profile.client_version(), "legacy-client");
|
||||||
assert!(profile.user_agent().contains("legacy-client"));
|
assert!(profile.user_agent().contains("legacy-client"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn client_certificate_args_parse() {
|
||||||
|
let cli = Cli::try_parse_from([
|
||||||
|
"gpauth",
|
||||||
|
"portal.example.com",
|
||||||
|
"--certificate",
|
||||||
|
"/tmp/client.pem",
|
||||||
|
"--sslkey",
|
||||||
|
"/tmp/client.key",
|
||||||
|
"--key-password",
|
||||||
|
"secret",
|
||||||
|
])
|
||||||
|
.expect("gpauth args should parse");
|
||||||
|
|
||||||
|
assert_eq!(cli.certificate.as_deref(), Some("/tmp/client.pem"));
|
||||||
|
assert_eq!(cli.sslkey.as_deref(), Some("/tmp/client.key"));
|
||||||
|
assert_eq!(cli.key_password.as_deref(), Some("secret"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -48,7 +48,7 @@ impl ConnectHandler<'_> {
|
|||||||
&self,
|
&self,
|
||||||
prelogin: &Prelogin,
|
prelogin: &Prelogin,
|
||||||
server: &str,
|
server: &str,
|
||||||
portal_default_browser_enabled: bool,
|
gateway_browser_auth_allowed: bool,
|
||||||
) -> anyhow::Result<Credential> {
|
) -> anyhow::Result<Credential> {
|
||||||
if should_read_stdin_credential(self.args.cookie_on_stdin, self.args.as_gateway, prelogin.is_gateway()) {
|
if should_read_stdin_credential(self.args.cookie_on_stdin, self.args.as_gateway, prelogin.is_gateway()) {
|
||||||
return self.read_cookie_from_stdin();
|
return self.read_cookie_from_stdin();
|
||||||
@@ -58,10 +58,10 @@ impl ConnectHandler<'_> {
|
|||||||
|
|
||||||
match prelogin {
|
match prelogin {
|
||||||
Prelogin::Saml(prelogin) => {
|
Prelogin::Saml(prelogin) => {
|
||||||
let external_browser_supported = default_browser_auth_allowed(
|
let external_browser_supported = can_use_external_browser_auth(
|
||||||
prelogin.support_default_browser(),
|
prelogin.support_default_browser(),
|
||||||
is_gateway,
|
is_gateway,
|
||||||
portal_default_browser_enabled,
|
gateway_browser_auth_allowed,
|
||||||
);
|
);
|
||||||
let browser = if external_browser_supported {
|
let browser = if external_browser_supported {
|
||||||
self.args.browser.as_deref()
|
self.args.browser.as_deref()
|
||||||
@@ -74,12 +74,16 @@ impl ConnectHandler<'_> {
|
|||||||
};
|
};
|
||||||
let verbose = self.shared_args.verbose.to_verbose_arg();
|
let verbose = self.shared_args.verbose.to_verbose_arg();
|
||||||
let os_profile = self.os_profile.borrow().clone();
|
let os_profile = self.os_profile.borrow().clone();
|
||||||
|
let key_password = self.latest_key_password.borrow().clone();
|
||||||
let auth_launcher = SamlAuthLauncher::new(server)
|
let auth_launcher = SamlAuthLauncher::new(server)
|
||||||
.gateway(is_gateway)
|
.gateway(is_gateway)
|
||||||
.saml_request(prelogin.saml_request())
|
.saml_request(prelogin.saml_request())
|
||||||
.os_profile(&os_profile)
|
.os_profile(&os_profile)
|
||||||
.fix_openssl(self.shared_args.fix_openssl)
|
.fix_openssl(self.shared_args.fix_openssl)
|
||||||
.ignore_tls_errors(self.shared_args.ignore_tls_errors)
|
.ignore_tls_errors(self.shared_args.ignore_tls_errors)
|
||||||
|
.certificate(self.args.certificate.as_deref())
|
||||||
|
.sslkey(self.args.sslkey.as_deref())
|
||||||
|
.key_password(key_password.as_deref())
|
||||||
.browser(browser)
|
.browser(browser)
|
||||||
.verbose(verbose);
|
.verbose(verbose);
|
||||||
|
|
||||||
@@ -184,12 +188,12 @@ fn should_read_stdin_credential(cookie_on_stdin: bool, as_gateway: bool, prelogi
|
|||||||
cookie_on_stdin && (!prelogin_is_gateway || as_gateway)
|
cookie_on_stdin && (!prelogin_is_gateway || as_gateway)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn default_browser_auth_allowed(
|
fn can_use_external_browser_auth(
|
||||||
saml_support_default_browser: bool,
|
saml_support_default_browser: bool,
|
||||||
is_gateway: bool,
|
is_gateway: bool,
|
||||||
portal_default_browser_enabled: bool,
|
gateway_browser_auth_allowed: bool,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
saml_support_default_browser && (!is_gateway || portal_default_browser_enabled)
|
saml_support_default_browser && (!is_gateway || gateway_browser_auth_allowed)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn log_stdin_host_id(host_id: Option<&str>) {
|
fn log_stdin_host_id(host_id: Option<&str>) {
|
||||||
@@ -250,18 +254,18 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn portal_saml_can_use_default_browser_when_supported() {
|
fn portal_saml_can_use_default_browser_when_supported() {
|
||||||
assert!(default_browser_auth_allowed(true, false, false));
|
assert!(can_use_external_browser_auth(true, false, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn gateway_saml_requires_portal_default_browser_policy() {
|
fn gateway_saml_requires_gateway_browser_auth_allowance() {
|
||||||
assert!(!default_browser_auth_allowed(true, true, false));
|
assert!(!can_use_external_browser_auth(true, true, false));
|
||||||
assert!(default_browser_auth_allowed(true, true, true));
|
assert!(can_use_external_browser_auth(true, true, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn default_browser_auth_requires_saml_support() {
|
fn default_browser_auth_requires_saml_support() {
|
||||||
assert!(!default_browser_auth_allowed(false, false, true));
|
assert!(!can_use_external_browser_auth(false, false, true));
|
||||||
assert!(!default_browser_auth_allowed(false, true, true));
|
assert!(!can_use_external_browser_auth(false, true, true));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -139,8 +139,11 @@ impl ConnectHandler<'_> {
|
|||||||
let mut gp_params = self.build_gp_params();
|
let mut gp_params = self.build_gp_params();
|
||||||
gp_params.set_is_gateway(true);
|
gp_params.set_is_gateway(true);
|
||||||
|
|
||||||
let prelogin = prelogin(gateway, &gp_params, self.prelogin_options(false)).await?;
|
let gateway_browser_auth_allowed = true;
|
||||||
let cred = self.obtain_credential(&prelogin, gateway, false).await?;
|
let prelogin = prelogin(gateway, &gp_params, self.direct_gateway_prelogin_options()).await?;
|
||||||
|
let cred = self
|
||||||
|
.obtain_credential(&prelogin, gateway, gateway_browser_auth_allowed)
|
||||||
|
.await?;
|
||||||
|
|
||||||
let login_session = self
|
let login_session = self
|
||||||
.login_gateway(gateway, &cred, &gp_params, gateway_context.as_ref())
|
.login_gateway(gateway, &cred, &gp_params, gateway_context.as_ref())
|
||||||
@@ -174,21 +177,18 @@ impl ConnectHandler<'_> {
|
|||||||
gateway: &str,
|
gateway: &str,
|
||||||
portal_cred: &AuthCookieCredential,
|
portal_cred: &AuthCookieCredential,
|
||||||
allow_extend_session: bool,
|
allow_extend_session: bool,
|
||||||
portal_default_browser_enabled: bool,
|
portal_config_default_browser: bool,
|
||||||
gateway_context: GatewayLoginContext,
|
gateway_context: GatewayLoginContext,
|
||||||
) -> Result<(), GatewayConnectError> {
|
) -> Result<(), GatewayConnectError> {
|
||||||
info!("Connecting to gateway with portal-cookie first, gateway prelogin fallback...");
|
info!("Connecting to gateway with portal-cookie first, gateway prelogin fallback...");
|
||||||
|
|
||||||
let mut gp_params = self.build_gp_params();
|
let mut gp_params = self.build_gp_params();
|
||||||
gp_params.set_is_gateway(true);
|
gp_params.set_is_gateway(true);
|
||||||
|
let gateway_browser_auth_allowed = self.gateway_browser_auth_allowed(portal_config_default_browser);
|
||||||
|
|
||||||
let gateway_prelogin = prelogin(
|
let gateway_prelogin = prelogin(gateway, &gp_params, self.prelogin_options(gateway_browser_auth_allowed))
|
||||||
gateway,
|
.await
|
||||||
&gp_params,
|
.map_err(GatewayConnectError::before_tunnel)?;
|
||||||
self.prelogin_options(portal_default_browser_enabled),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.map_err(GatewayConnectError::before_tunnel)?;
|
|
||||||
|
|
||||||
if portal_cred.can_authenticate_gateway() {
|
if portal_cred.can_authenticate_gateway() {
|
||||||
let portal_cred_for_login: Credential = portal_cred.into();
|
let portal_cred_for_login: Credential = portal_cred.into();
|
||||||
@@ -219,7 +219,7 @@ impl ConnectHandler<'_> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let gateway_cred = match self
|
let gateway_cred = match self
|
||||||
.obtain_credential(&gateway_prelogin, gateway, portal_default_browser_enabled)
|
.obtain_credential(&gateway_prelogin, gateway, gateway_browser_auth_allowed)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(cred) => cred,
|
Ok(cred) => cred,
|
||||||
|
|||||||
@@ -65,10 +65,18 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
builder.build()
|
builder.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn prelogin_options(&self, portal_default_browser_enabled: bool) -> PreloginOptions {
|
pub(super) fn prelogin_options(&self, gateway_browser_auth_allowed: bool) -> PreloginOptions {
|
||||||
PreloginOptions::default()
|
PreloginOptions::default()
|
||||||
.external_browser_requested(self.external_browser_requested())
|
.external_browser_requested(self.external_browser_requested())
|
||||||
.portal_default_browser_enabled(portal_default_browser_enabled)
|
.gateway_external_browser_allowed(gateway_browser_auth_allowed)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn direct_gateway_prelogin_options(&self) -> PreloginOptions {
|
||||||
|
self.prelogin_options(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) fn gateway_browser_auth_allowed(&self, portal_config_default_browser: bool) -> bool {
|
||||||
|
gateway_browser_auth_allowed(portal_config_default_browser, self.external_browser_requested())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn external_browser_requested(&self) -> bool {
|
fn external_browser_requested(&self) -> bool {
|
||||||
@@ -169,7 +177,8 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
None => portal_config.auth_cookie().clone(),
|
None => portal_config.auth_cookie().clone(),
|
||||||
};
|
};
|
||||||
let allow_extend_session = portal_config.allow_extend_session().unwrap_or(false);
|
let allow_extend_session = portal_config.allow_extend_session().unwrap_or(false);
|
||||||
let portal_default_browser_enabled = portal_config.default_browser().unwrap_or(false);
|
let portal_config_default_browser = portal_config.default_browser().unwrap_or(false);
|
||||||
|
info!("Portal config default-browser: {}", portal_config_default_browser);
|
||||||
|
|
||||||
if self.args.auto_gateway {
|
if self.args.auto_gateway {
|
||||||
let gateways = portal_config.gateways();
|
let gateways = portal_config.gateways();
|
||||||
@@ -194,7 +203,7 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
gateway.server(),
|
gateway.server(),
|
||||||
&auth_cookie,
|
&auth_cookie,
|
||||||
allow_extend_session,
|
allow_extend_session,
|
||||||
portal_default_browser_enabled,
|
portal_config_default_browser,
|
||||||
gateway_context,
|
gateway_context,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
@@ -259,7 +268,7 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
gateway,
|
gateway,
|
||||||
&auth_cookie,
|
&auth_cookie,
|
||||||
allow_extend_session,
|
allow_extend_session,
|
||||||
portal_default_browser_enabled,
|
portal_config_default_browser,
|
||||||
gateway_context,
|
gateway_context,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
@@ -279,3 +288,27 @@ impl<'a> ConnectHandler<'a> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn gateway_browser_auth_allowed(portal_config_default_browser: bool, external_browser_requested: bool) -> bool {
|
||||||
|
portal_config_default_browser || external_browser_requested
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::gateway_browser_auth_allowed;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gateway_browser_auth_is_allowed_by_portal_config() {
|
||||||
|
assert!(gateway_browser_auth_allowed(true, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gateway_browser_auth_is_allowed_by_explicit_browser_request() {
|
||||||
|
assert!(gateway_browser_auth_allowed(false, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gateway_browser_auth_is_disabled_without_portal_config_or_user_request() {
|
||||||
|
assert!(!gateway_browser_auth_allowed(false, false));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2.6.2
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed gateway fallback browser authentication when external browser authentication is explicitly requested.
|
||||||
|
- Added logging for portal config default-browser behavior.
|
||||||
|
- Added GUI managed configuration support with `gpgui.conf`, including reset to managed config.
|
||||||
|
- Improved GUI config directory migration and managed license auto activation.
|
||||||
|
|
||||||
## 2.6.1
|
## 2.6.1
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
@@ -12,6 +21,7 @@
|
|||||||
|
|
||||||
- Fixed NixOS GUI launch failures caused by package-local binary paths.
|
- Fixed NixOS GUI launch failures caused by package-local binary paths.
|
||||||
- Fixed NixOS tray icon setup documentation for GNOME desktops.
|
- Fixed NixOS tray icon setup documentation for GNOME desktops.
|
||||||
|
- Fixed browser authentication for portals that require a client certificate.
|
||||||
- Fixed release automation so Nix flake hash updates are run manually after release assets are available.
|
- Fixed release automation so Nix flake hash updates are run manually after release assets are available.
|
||||||
|
|
||||||
## 2.6.0
|
## 2.6.0
|
||||||
|
|||||||
@@ -19,10 +19,11 @@ pub async fn auth_prelogin(
|
|||||||
server: &str,
|
server: &str,
|
||||||
gp_params: &GpParams,
|
gp_params: &GpParams,
|
||||||
external_browser_requested: bool,
|
external_browser_requested: bool,
|
||||||
|
gateway_external_browser_allowed: bool,
|
||||||
) -> anyhow::Result<String> {
|
) -> anyhow::Result<String> {
|
||||||
// gpauth only performs the initial portal/gateway prelogin. Portal policy is
|
let options = PreloginOptions::default()
|
||||||
// not available here, so gateway prelogin stays on the embedded value.
|
.external_browser_requested(external_browser_requested)
|
||||||
let options = PreloginOptions::default().external_browser_requested(external_browser_requested);
|
.gateway_external_browser_allowed(gateway_external_browser_allowed);
|
||||||
match prelogin(server, gp_params, options).await? {
|
match prelogin(server, gp_params, options).await? {
|
||||||
Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()),
|
Prelogin::Saml(prelogin) => Ok(prelogin.saml_request().to_string()),
|
||||||
Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"),
|
Prelogin::Standard(_) => bail!("Received non-SAML prelogin response"),
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
|||||||
|
|
||||||
let auth_request = match self.auth_request {
|
let auth_request = match self.auth_request {
|
||||||
Some(auth_request) => auth_request.to_string(),
|
Some(auth_request) => auth_request.to_string(),
|
||||||
None => auth_prelogin(&self.server, &self.gp_params, false).await?,
|
None => auth_prelogin(&self.server, &self.gp_params, false, false).await?,
|
||||||
};
|
};
|
||||||
|
|
||||||
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
|
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
|
||||||
@@ -257,7 +257,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
|||||||
document.body.appendChild(loading);
|
document.body.appendChild(loading);
|
||||||
"#)?;
|
"#)?;
|
||||||
|
|
||||||
let auth_request = auth_prelogin(&self.server, &self.gp_params, false).await?;
|
let auth_request = auth_prelogin(&self.server, &self.gp_params, false, false).await?;
|
||||||
|
|
||||||
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
|
let (tx, rx) = oneshot::channel::<anyhow::Result<()>>();
|
||||||
let webview_user_agent = self.webview_user_agent.clone();
|
let webview_user_agent = self.webview_user_agent.clone();
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ impl Prelogin {
|
|||||||
#[derive(Debug, Clone, Copy, Default)]
|
#[derive(Debug, Clone, Copy, Default)]
|
||||||
pub struct PreloginOptions {
|
pub struct PreloginOptions {
|
||||||
external_browser_requested: bool,
|
external_browser_requested: bool,
|
||||||
portal_default_browser_enabled: bool,
|
gateway_external_browser_allowed: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PreloginOptions {
|
impl PreloginOptions {
|
||||||
@@ -99,13 +99,13 @@ impl PreloginOptions {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn portal_default_browser_enabled(mut self, portal_default_browser_enabled: bool) -> Self {
|
pub fn gateway_external_browser_allowed(mut self, gateway_external_browser_allowed: bool) -> Self {
|
||||||
self.portal_default_browser_enabled = portal_default_browser_enabled;
|
self.gateway_external_browser_allowed = gateway_external_browser_allowed;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
fn browser_mode(self, is_gateway: bool) -> PreloginBrowserMode {
|
fn browser_mode(self, is_gateway: bool) -> PreloginBrowserMode {
|
||||||
if self.external_browser_requested && (!is_gateway || self.portal_default_browser_enabled) {
|
if self.external_browser_requested && (!is_gateway || self.gateway_external_browser_allowed) {
|
||||||
PreloginBrowserMode::External
|
PreloginBrowserMode::External
|
||||||
} else {
|
} else {
|
||||||
PreloginBrowserMode::Embedded
|
PreloginBrowserMode::Embedded
|
||||||
@@ -307,12 +307,12 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn browser_mode_requires_portal_policy_for_gateway_external() {
|
fn browser_mode_requires_gateway_external_browser_allowed_for_gateway_external() {
|
||||||
let options = PreloginOptions::default().external_browser_requested(true);
|
let options = PreloginOptions::default().external_browser_requested(true);
|
||||||
|
|
||||||
assert_eq!(options.browser_mode(true), PreloginBrowserMode::Embedded);
|
assert_eq!(options.browser_mode(true), PreloginBrowserMode::Embedded);
|
||||||
|
|
||||||
let options = options.portal_default_browser_enabled(true);
|
let options = options.gateway_external_browser_allowed(true);
|
||||||
|
|
||||||
assert_eq!(options.browser_mode(true), PreloginBrowserMode::External);
|
assert_eq!(options.browser_mode(true), PreloginBrowserMode::External);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,9 @@ pub struct SamlAuthLauncher<'a> {
|
|||||||
os: Option<&'a str>,
|
os: Option<&'a str>,
|
||||||
host_id: Option<&'a str>,
|
host_id: Option<&'a str>,
|
||||||
client_version: Option<&'a str>,
|
client_version: Option<&'a str>,
|
||||||
|
certificate: Option<&'a str>,
|
||||||
|
sslkey: Option<&'a str>,
|
||||||
|
key_password: Option<&'a str>,
|
||||||
fix_openssl: bool,
|
fix_openssl: bool,
|
||||||
ignore_tls_errors: bool,
|
ignore_tls_errors: bool,
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
@@ -38,6 +41,9 @@ impl<'a> SamlAuthLauncher<'a> {
|
|||||||
os: None,
|
os: None,
|
||||||
host_id: None,
|
host_id: None,
|
||||||
client_version: None,
|
client_version: None,
|
||||||
|
certificate: None,
|
||||||
|
sslkey: None,
|
||||||
|
key_password: None,
|
||||||
fix_openssl: false,
|
fix_openssl: false,
|
||||||
ignore_tls_errors: false,
|
ignore_tls_errors: false,
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
@@ -83,6 +89,21 @@ impl<'a> SamlAuthLauncher<'a> {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn certificate(mut self, certificate: Option<&'a str>) -> Self {
|
||||||
|
self.certificate = certificate;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn sslkey(mut self, sslkey: Option<&'a str>) -> Self {
|
||||||
|
self.sslkey = sslkey;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn key_password(mut self, key_password: Option<&'a str>) -> Self {
|
||||||
|
self.key_password = key_password;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
pub fn hidpi(mut self, hidpi: bool) -> Self {
|
pub fn hidpi(mut self, hidpi: bool) -> Self {
|
||||||
self.hidpi = hidpi;
|
self.hidpi = hidpi;
|
||||||
@@ -148,6 +169,18 @@ impl<'a> SamlAuthLauncher<'a> {
|
|||||||
auth_cmd.arg("--ignore-tls-errors");
|
auth_cmd.arg("--ignore-tls-errors");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if let Some(certificate) = self.certificate {
|
||||||
|
auth_cmd.arg("--certificate").arg(certificate);
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(sslkey) = self.sslkey {
|
||||||
|
auth_cmd.arg("--sslkey").arg(sslkey);
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(key_password) = self.key_password {
|
||||||
|
auth_cmd.arg("--key-password").arg(key_password);
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(feature = "webview-auth")]
|
#[cfg(feature = "webview-auth")]
|
||||||
{
|
{
|
||||||
if self.hidpi {
|
if self.hidpi {
|
||||||
@@ -222,4 +255,16 @@ mod tests {
|
|||||||
|
|
||||||
assert_eq!(launcher.client_version, Some("6.0.0"));
|
assert_eq!(launcher.client_version, Some("6.0.0"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn client_certificate_options_are_stored() {
|
||||||
|
let launcher = SamlAuthLauncher::new("portal.example.com")
|
||||||
|
.certificate(Some("/tmp/client.pem"))
|
||||||
|
.sslkey(Some("/tmp/client.key"))
|
||||||
|
.key_password(Some("secret"));
|
||||||
|
|
||||||
|
assert_eq!(launcher.certificate, Some("/tmp/client.pem"));
|
||||||
|
assert_eq!(launcher.sslkey, Some("/tmp/client.key"));
|
||||||
|
assert_eq!(launcher.key_password, Some("secret"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -10,6 +10,8 @@ if [[ -z "$tag" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
version="${tag#v}"
|
version="${tag#v}"
|
||||||
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
changelog="$script_dir/../changelog.md"
|
||||||
|
|
||||||
awk -v version="$version" '
|
awk -v version="$version" '
|
||||||
$0 == "## " version {
|
$0 == "## " version {
|
||||||
@@ -27,4 +29,4 @@ awk -v version="$version" '
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
' changelog.md
|
' "$changelog"
|
||||||
Reference in new issue
Block a user