mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 06:26:14 -05:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c601fa9aa2 | ||
|
|
ae4cbedd3b | ||
|
|
fe55d11fc4 | ||
|
|
34f1feaf43 | ||
|
|
f640b4d325 |
No files matched your search
@@ -306,6 +306,51 @@ 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
|
||||||
|
|
||||||
|
! grep -R '/usr/bin/gp' result/share
|
||||||
|
|
||||||
setup-bsd-matrix:
|
setup-bsd-matrix:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ jobs:
|
|||||||
sed -i "s/DISABLE_RUST_TOOLCHAIN = 0/DISABLE_RUST_TOOLCHAIN = 1/g" .build/debian/rules
|
sed -i "s/DISABLE_RUST_TOOLCHAIN = 0/DISABLE_RUST_TOOLCHAIN = 1/g" .build/debian/rules
|
||||||
|
|
||||||
- name: Publish to PPA
|
- name: Publish to PPA
|
||||||
uses: yuezk/publish-ppa-package@gp
|
uses: yuezk/publish-ppa-package@main
|
||||||
with:
|
with:
|
||||||
repository: "yuezk/globalprotect-openconnect"
|
repository: "yuezk/globalprotect-openconnect"
|
||||||
gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
|
gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
|
||||||
|
|||||||
@@ -214,45 +214,41 @@ This repository includes a flake for NixOS integration.
|
|||||||
|
|
||||||
#### Installation Steps
|
#### Installation Steps
|
||||||
|
|
||||||
1. Add the flake to your `flake.nix`:
|
Add the flake input and package to your `flake.nix`:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
# ... other inputs
|
# ... other inputs
|
||||||
globalprotect-openconnect.url = "github:yuezk/GlobalProtect-openconnect";
|
globalprotect-openconnect.url = "github:yuezk/GlobalProtect-openconnect";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = { self, nixpkgs, globalprotect-openconnect, ... }:
|
||||||
|
let
|
||||||
|
system = "x86_64-linux"; # or "aarch64-linux" for ARM64
|
||||||
|
hostname = "<your-host>";
|
||||||
|
in {
|
||||||
|
nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {
|
||||||
|
inherit system;
|
||||||
|
|
||||||
|
modules = [
|
||||||
|
./configuration.nix
|
||||||
|
{
|
||||||
|
environment.systemPackages = [
|
||||||
|
globalprotect-openconnect.packages.${system}.default
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
outputs = { nixpkgs, ... }@inputs: {
|
Apply:
|
||||||
nixosConfigurations.<your-host> = nixpkgs.lib.nixosSystem {
|
|
||||||
specialArgs = { inherit inputs; };
|
|
||||||
modules = [
|
|
||||||
./configuration.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Add the package to your `configuration.nix`:
|
```bash
|
||||||
|
sudo nixos-rebuild switch
|
||||||
```nix
|
```
|
||||||
{ pkgs, inputs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# ... other configurations
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
# ... other packages
|
|
||||||
inputs.globalprotect-openconnect.packages.${pkgs.stdenv.hostPlatform.system}.default
|
|
||||||
];
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
3. Apply the changes:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo nixos-rebuild switch
|
|
||||||
```
|
|
||||||
|
|
||||||
### Official Docker Image
|
### Official Docker Image
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ use std::{
|
|||||||
io::BufReader,
|
io::BufReader,
|
||||||
ops::ControlFlow,
|
ops::ControlFlow,
|
||||||
os::unix::fs::PermissionsExt,
|
os::unix::fs::PermissionsExt,
|
||||||
path::PathBuf,
|
|
||||||
sync::Arc,
|
sync::Arc,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -17,7 +16,7 @@ use axum::{
|
|||||||
http::StatusCode,
|
http::StatusCode,
|
||||||
response::IntoResponse,
|
response::IntoResponse,
|
||||||
};
|
};
|
||||||
use common::constants::GP_GUI_BINARY;
|
use common::binary_paths;
|
||||||
use futures::{SinkExt, StreamExt};
|
use futures::{SinkExt, StreamExt};
|
||||||
use gpapi::{
|
use gpapi::{
|
||||||
service::{event::WsEvent, request::UpdateGuiRequest},
|
service::{event::WsEvent, request::UpdateGuiRequest},
|
||||||
@@ -67,8 +66,8 @@ pub async fn update_gui(State(ctx): State<Arc<WsServerContext>>, body: Bytes) ->
|
|||||||
|
|
||||||
// Unpack GPGUI archive, gpgui_2.0.0_{arch}.bin.tar.xz and install it
|
// Unpack GPGUI archive, gpgui_2.0.0_{arch}.bin.tar.xz and install it
|
||||||
async fn install_gui(src: &str) -> anyhow::Result<()> {
|
async fn install_gui(src: &str) -> anyhow::Result<()> {
|
||||||
let path = PathBuf::from(GP_GUI_BINARY);
|
let target = binary_paths::gpgui();
|
||||||
let Some(dir) = path.parent() else {
|
let Some(dir) = target.parent() else {
|
||||||
bail!("Failed to get parent directory of GUI binary");
|
bail!("Failed to get parent directory of GUI binary");
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -81,13 +80,13 @@ async fn install_gui(src: &str) -> anyhow::Result<()> {
|
|||||||
|
|
||||||
for entry in ar.entries()? {
|
for entry in ar.entries()? {
|
||||||
let mut entry = entry?;
|
let mut entry = entry?;
|
||||||
let path = entry.path()?;
|
let entry_path = entry.path()?;
|
||||||
|
|
||||||
if let Some(name) = path.file_name() {
|
if let Some(name) = entry_path.file_name() {
|
||||||
let name = name.to_string_lossy();
|
let name = name.to_string_lossy();
|
||||||
|
|
||||||
if name == "gpgui" {
|
if name == "gpgui" {
|
||||||
let mut file = File::create(GP_GUI_BINARY)?;
|
let mut file = File::create(&target)?;
|
||||||
std::io::copy(&mut entry, &mut file)?;
|
std::io::copy(&mut entry, &mut file)?;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -95,7 +94,7 @@ async fn install_gui(src: &str) -> anyhow::Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Make the binary executable
|
// Make the binary executable
|
||||||
fs::set_permissions(GP_GUI_BINARY, Permissions::from_mode(0o755)).await?;
|
fs::set_permissions(target, Permissions::from_mode(0o755)).await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use axum::extract::ws::Message;
|
use axum::extract::ws::Message;
|
||||||
use common::constants::GP_AUTH_BINARY;
|
use common::binary_paths;
|
||||||
use gpapi::{
|
use gpapi::{
|
||||||
os_profile::HostIdentity,
|
os_profile::HostIdentity,
|
||||||
service::{
|
service::{
|
||||||
@@ -73,7 +73,7 @@ impl WsServerContext {
|
|||||||
vpn_state: self.vpn_state_rx.borrow().clone(),
|
vpn_state: self.vpn_state_rx.borrow().clone(),
|
||||||
vpnc_script: find_vpnc_script().map(|s| s.to_owned()),
|
vpnc_script: find_vpnc_script().map(|s| s.to_owned()),
|
||||||
csd_wrapper: find_csd_wrapper().map(|s| s.to_owned()),
|
csd_wrapper: find_csd_wrapper().map(|s| s.to_owned()),
|
||||||
auth_executable: GP_AUTH_BINARY.to_owned(),
|
auth_executable: binary_paths::gpauth().to_string_lossy().into_owned(),
|
||||||
host_info,
|
host_info,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
use std::{
|
||||||
|
env,
|
||||||
|
path::{Path, PathBuf},
|
||||||
|
};
|
||||||
|
|
||||||
|
use crate::constants::{GP_AUTH_BINARY, GP_CLIENT_BINARY, GP_GUI_BINARY, GP_GUI_HELPER_BINARY, GP_SERVICE_BINARY};
|
||||||
|
|
||||||
|
pub fn gpclient() -> PathBuf {
|
||||||
|
resolve("GP_CLIENT_BINARY", "gpclient", GP_CLIENT_BINARY)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn gpservice() -> PathBuf {
|
||||||
|
resolve("GP_SERVICE_BINARY", "gpservice", GP_SERVICE_BINARY)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn gpauth() -> PathBuf {
|
||||||
|
resolve("GP_AUTH_BINARY", "gpauth", GP_AUTH_BINARY)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn gpgui() -> PathBuf {
|
||||||
|
resolve("GP_GUI_BINARY", "gpgui", GP_GUI_BINARY)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn gpgui_helper() -> PathBuf {
|
||||||
|
resolve("GP_GUI_HELPER_BINARY", "gpgui-helper", GP_GUI_HELPER_BINARY)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn resolve(env_key: &str, binary_name: &str, default_path: &str) -> PathBuf {
|
||||||
|
env::var_os(env_key)
|
||||||
|
.filter(|value| !value.is_empty())
|
||||||
|
.map(PathBuf::from)
|
||||||
|
.or_else(|| sibling_binary(binary_name))
|
||||||
|
.unwrap_or_else(|| PathBuf::from(default_path))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn sibling_binary(binary_name: &str) -> Option<PathBuf> {
|
||||||
|
let current_exe = env::current_exe().ok()?;
|
||||||
|
let bin_dir = current_exe.parent()?;
|
||||||
|
let binary = bin_dir.join(binary_name);
|
||||||
|
|
||||||
|
is_file(&binary).then_some(binary)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_file(path: &Path) -> bool {
|
||||||
|
path.is_file()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn default_path_is_used_when_no_sibling_exists() {
|
||||||
|
let path = resolve("GP_TEST_BINARY", "missing-gp-test-binary", "/usr/bin/gp-test");
|
||||||
|
|
||||||
|
assert_eq!(path, PathBuf::from("/usr/bin/gp-test"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1 +1,2 @@
|
|||||||
|
pub mod binary_paths;
|
||||||
pub mod constants;
|
pub mod constants;
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
use std::process::Stdio;
|
use std::{path::PathBuf, process::Stdio};
|
||||||
|
|
||||||
use anyhow::bail;
|
use anyhow::bail;
|
||||||
use common::constants::GP_AUTH_BINARY;
|
use common::binary_paths;
|
||||||
use tokio::process::Command;
|
use tokio::process::Command;
|
||||||
|
|
||||||
use crate::{auth::SamlAuthResult, credential::Credential, os_profile::OsProfile};
|
use crate::{auth::SamlAuthResult, credential::Credential, os_profile::OsProfile};
|
||||||
@@ -113,8 +113,11 @@ impl<'a> SamlAuthLauncher<'a> {
|
|||||||
|
|
||||||
/// Launch the authenticator binary as the current user or SUDO_USER if available.
|
/// Launch the authenticator binary as the current user or SUDO_USER if available.
|
||||||
pub async fn launch(self) -> anyhow::Result<Credential> {
|
pub async fn launch(self) -> anyhow::Result<Credential> {
|
||||||
let program = self.auth_executable.unwrap_or(GP_AUTH_BINARY);
|
let program = self
|
||||||
let mut auth_cmd = Command::new(program);
|
.auth_executable
|
||||||
|
.map(PathBuf::from)
|
||||||
|
.unwrap_or_else(binary_paths::gpauth);
|
||||||
|
let mut auth_cmd = Command::new(&program);
|
||||||
auth_cmd.arg(self.server);
|
auth_cmd.arg(self.server);
|
||||||
|
|
||||||
if self.gateway {
|
if self.gateway {
|
||||||
@@ -174,7 +177,7 @@ impl<'a> SamlAuthLauncher<'a> {
|
|||||||
let child = match child {
|
let child = match child {
|
||||||
Ok(child) => child,
|
Ok(child) => child,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
bail!("Failed to spawn {}: {}", program, err);
|
bail!("Failed to spawn {}: {}", program.display(), err);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use std::{collections::HashMap, path::PathBuf, process::Stdio};
|
use std::{collections::HashMap, path::PathBuf, process::Stdio};
|
||||||
|
|
||||||
use anyhow::bail;
|
use anyhow::bail;
|
||||||
use common::constants::GP_GUI_HELPER_BINARY;
|
use common::binary_paths;
|
||||||
use log::info;
|
use log::info;
|
||||||
use tokio::{io::AsyncWriteExt, process::Command};
|
use tokio::{io::AsyncWriteExt, process::Command};
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ pub struct GuiHelperLauncher<'a> {
|
|||||||
impl<'a> GuiHelperLauncher<'a> {
|
impl<'a> GuiHelperLauncher<'a> {
|
||||||
pub fn new(api_key: &'a [u8]) -> Self {
|
pub fn new(api_key: &'a [u8]) -> Self {
|
||||||
Self {
|
Self {
|
||||||
program: GP_GUI_HELPER_BINARY.into(),
|
program: binary_paths::gpgui_helper(),
|
||||||
envs: None,
|
envs: None,
|
||||||
api_key,
|
api_key,
|
||||||
gui_version: None,
|
gui_version: None,
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use anyhow::bail;
|
use anyhow::bail;
|
||||||
use common::constants::GP_GUI_BINARY;
|
use common::binary_paths;
|
||||||
use log::info;
|
use log::info;
|
||||||
use tokio::{io::AsyncWriteExt, process::Command};
|
use tokio::{io::AsyncWriteExt, process::Command};
|
||||||
|
|
||||||
@@ -25,7 +25,7 @@ impl<'a> GuiLauncher<'a> {
|
|||||||
pub fn new(version: &'a str, api_key: &'a [u8]) -> Self {
|
pub fn new(version: &'a str, api_key: &'a [u8]) -> Self {
|
||||||
Self {
|
Self {
|
||||||
version,
|
version,
|
||||||
program: GP_GUI_BINARY.into(),
|
program: binary_paths::gpgui(),
|
||||||
api_key,
|
api_key,
|
||||||
minimized: false,
|
minimized: false,
|
||||||
envs: None,
|
envs: None,
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ use std::{
|
|||||||
process::{ExitStatus, Stdio},
|
process::{ExitStatus, Stdio},
|
||||||
};
|
};
|
||||||
|
|
||||||
use common::constants::GP_SERVICE_BINARY;
|
use common::binary_paths;
|
||||||
use tokio::process::Command;
|
use tokio::process::Command;
|
||||||
|
|
||||||
use super::command_traits::CommandExt;
|
use super::command_traits::CommandExt;
|
||||||
@@ -26,7 +26,7 @@ impl Default for ServiceLauncher<'_> {
|
|||||||
impl<'a> ServiceLauncher<'a> {
|
impl<'a> ServiceLauncher<'a> {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
Self {
|
Self {
|
||||||
program: GP_SERVICE_BINARY.into(),
|
program: binary_paths::gpservice(),
|
||||||
minimized: false,
|
minimized: false,
|
||||||
env_file: None,
|
env_file: None,
|
||||||
log_file: None,
|
log_file: None,
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ index 03f47004..9e585119 100644
|
|||||||
@@ -1049,6 +1050,20 @@ const char *openconnect_get_gp_os_version(struct openconnect_info *vpninfo)
|
@@ -1049,6 +1050,20 @@ const char *openconnect_get_gp_os_version(struct openconnect_info *vpninfo)
|
||||||
return vpninfo->gp_os_version ?: vpninfo->platname;
|
return vpninfo->gp_os_version ?: vpninfo->platname;
|
||||||
}
|
}
|
||||||
|
|
||||||
+int openconnect_set_gp_host_id(struct openconnect_info *vpninfo,
|
+int openconnect_set_gp_host_id(struct openconnect_info *vpninfo,
|
||||||
+ const char *gp_host_id)
|
+ const char *gp_host_id)
|
||||||
+{
|
+{
|
||||||
@@ -68,19 +68,19 @@ index a7e80659..76034fbd 100644
|
|||||||
char *gp_app_version;
|
char *gp_app_version;
|
||||||
char *gp_os_version;
|
char *gp_os_version;
|
||||||
+ char *gp_host_id;
|
+ char *gp_host_id;
|
||||||
|
|
||||||
const char *quit_reason;
|
const char *quit_reason;
|
||||||
const char *delay_tunnel_reason; /* If non-null, provides a reason why protocol is not yet ready for tunnel setup */
|
const char *delay_tunnel_reason; /* If non-null, provides a reason why protocol is not yet ready for tunnel setup */
|
||||||
@@ -1684,6 +1685,9 @@ const char *openconnect_get_gp_app_version(struct openconnect_info *vpninfo);
|
@@ -1684,6 +1685,9 @@ const char *openconnect_get_gp_app_version(struct openconnect_info *vpninfo);
|
||||||
/* Get the OS version string for GP */
|
/* Get the OS version string for GP */
|
||||||
const char *openconnect_get_gp_os_version(struct openconnect_info *vpninfo);
|
const char *openconnect_get_gp_os_version(struct openconnect_info *vpninfo);
|
||||||
|
|
||||||
+/* Get the host ID string for GP */
|
+/* Get the host ID string for GP */
|
||||||
+const char *openconnect_get_gp_host_id(struct openconnect_info *vpninfo);
|
+const char *openconnect_get_gp_host_id(struct openconnect_info *vpninfo);
|
||||||
+
|
+
|
||||||
/* version.c */
|
/* version.c */
|
||||||
extern const char openconnect_version_str[];
|
extern const char openconnect_version_str[];
|
||||||
|
|
||||||
diff --git a/openconnect.h b/openconnect.h
|
diff --git a/openconnect.h b/openconnect.h
|
||||||
index 40de2811..3c65c090 100644
|
index 40de2811..3c65c090 100644
|
||||||
--- a/openconnect.h
|
--- a/openconnect.h
|
||||||
@@ -93,9 +93,9 @@ index 40de2811..3c65c090 100644
|
|||||||
+int openconnect_set_gp_host_id(struct openconnect_info *vpninfo,
|
+int openconnect_set_gp_host_id(struct openconnect_info *vpninfo,
|
||||||
+ const char *gp_host_id);
|
+ const char *gp_host_id);
|
||||||
+
|
+
|
||||||
|
|
||||||
int openconnect_passphrase_from_fsid(struct openconnect_info *vpninfo);
|
int openconnect_passphrase_from_fsid(struct openconnect_info *vpninfo);
|
||||||
int openconnect_obtain_cookie(struct openconnect_info *vpninfo);
|
int openconnect_obtain_cookie(struct openconnect_info *vpninfo);
|
||||||
int openconnect_init_ssl(void);
|
int openconnect_init_ssl(void);
|
||||||
--
|
--
|
||||||
2.50.1 (Apple Git-155)
|
2.50.1 (Apple Git-155)
|
||||||
@@ -21,6 +21,7 @@
|
|||||||
inherit system;
|
inherit system;
|
||||||
overlays = [ (import rust-overlay) ];
|
overlays = [ (import rust-overlay) ];
|
||||||
};
|
};
|
||||||
|
inherit (pkgs) lib;
|
||||||
|
|
||||||
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
|
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
|
||||||
pname = "globalprotect-openconnect";
|
pname = "globalprotect-openconnect";
|
||||||
@@ -35,46 +36,94 @@
|
|||||||
|
|
||||||
src = pkgs.fetchzip {
|
src = pkgs.fetchzip {
|
||||||
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz";
|
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz";
|
||||||
hash = "sha256-NS3tIZxkT9A4eqmfkcl29bHHJrrgVs/XSQBOz99cP30=";
|
hash = "sha256-Ejvb//r6tE6yMwNwUJq5Z0r57K0IHKFN1YVaXnvpGIs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
|
cpu = pkgs.stdenv.hostPlatform.parsed.cpu.name;
|
||||||
|
|
||||||
|
gpguiHashes = {
|
||||||
|
x86_64 = "sha256-jLMErGlfbzhRk8onqqiRXOMeNhdFWBZGOqPPEh9vLyM=";
|
||||||
|
aarch64 = "sha256-YSjn2oxDaKTtdfK7rsmuMZfD9n1bitVbScIW0fyedXI=";
|
||||||
|
};
|
||||||
|
|
||||||
gpgui = pkgs.fetchzip {
|
gpgui = pkgs.fetchzip {
|
||||||
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/gpgui_${cpu}.bin.tar.xz";
|
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/gpgui_${cpu}.bin.tar.xz";
|
||||||
hash = {
|
hash = gpguiHashes.${cpu};
|
||||||
x86_64 = "sha256-1XBdrKJOhSViZOgfqohZjdzV6qzx/qpy0yhkbZ8DumA=";
|
|
||||||
aarch64 = "sha256-humujgf/M31SkBABc14g/ujjacGHxqElzNuCClhTAfA=";
|
|
||||||
}.${cpu};
|
|
||||||
};
|
};
|
||||||
in
|
|
||||||
{
|
binaryHashes = {
|
||||||
# For `nix build`
|
x86_64 = "sha256-atZRM7v5areQTDkrJrOczSz0tc3P6aGU+BE4VblNE08=";
|
||||||
packages.default = naersk'.buildPackage {
|
aarch64 = "sha256-ENE0fHlLSt493QIlotaIMf11MszJszl4ZZAsYWuFJeE=";
|
||||||
|
};
|
||||||
|
|
||||||
|
binaryPackage = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect_${version}_${cpu}.bin.tar.xz";
|
||||||
|
hash = binaryHashes.${cpu};
|
||||||
|
};
|
||||||
|
|
||||||
|
linuxRuntimeDependencies = with pkgs; [
|
||||||
|
glib-networking
|
||||||
|
libappindicator-gtk3
|
||||||
|
];
|
||||||
|
|
||||||
|
linuxBuildInputs =
|
||||||
|
with pkgs;
|
||||||
|
[
|
||||||
|
libxml2
|
||||||
|
zlib
|
||||||
|
lz4
|
||||||
|
gnutls
|
||||||
|
p11-kit
|
||||||
|
nettle
|
||||||
|
gmp
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.isLinux [
|
||||||
|
glib
|
||||||
|
gtk3
|
||||||
|
libsoup_3
|
||||||
|
webkitgtk_4_1
|
||||||
|
glib-networking
|
||||||
|
openssl
|
||||||
|
libsecret
|
||||||
|
libappindicator-gtk3
|
||||||
|
];
|
||||||
|
|
||||||
|
rewriteSourceInstallPaths = ''
|
||||||
|
substituteInPlace $out/share/applications/gpgui.desktop \
|
||||||
|
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
||||||
|
|
||||||
|
substituteInPlace $out/libexec/gpclient/hipreport.sh \
|
||||||
|
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
||||||
|
|
||||||
|
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
|
||||||
|
--replace-fail /usr/bin/gpservice $out/bin/gpservice
|
||||||
|
|
||||||
|
if [ -f $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down ]; then
|
||||||
|
substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \
|
||||||
|
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
rewriteHostInstallPaths = ''
|
||||||
|
substituteInPlace $out/share/applications/gpgui.desktop \
|
||||||
|
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
||||||
|
|
||||||
|
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
|
||||||
|
--replace-fail /usr/bin/gpservice $out/bin/gpservice
|
||||||
|
|
||||||
|
if [ -f $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down ]; then
|
||||||
|
substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \
|
||||||
|
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
fromSource = naersk'.buildPackage {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
# Must be set to true to avoid issues with the Tauri build process
|
# Must be set to true to avoid issues with the Tauri build process
|
||||||
singleStep = true;
|
singleStep = true;
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = linuxBuildInputs;
|
||||||
with pkgs;
|
|
||||||
[
|
|
||||||
libxml2
|
|
||||||
zlib
|
|
||||||
lz4
|
|
||||||
gnutls
|
|
||||||
p11-kit
|
|
||||||
nettle
|
|
||||||
gmp
|
|
||||||
]
|
|
||||||
++ lib.optionals stdenv.isLinux [
|
|
||||||
glib
|
|
||||||
gtk3
|
|
||||||
libsoup_3
|
|
||||||
webkitgtk_4_1
|
|
||||||
glib-networking
|
|
||||||
openssl
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
with pkgs;
|
with pkgs;
|
||||||
@@ -89,13 +138,7 @@
|
|||||||
wrapGAppsHook4
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
runtimeDependencies =
|
runtimeDependencies = lib.optionals pkgs.stdenv.isLinux linuxRuntimeDependencies;
|
||||||
with pkgs;
|
|
||||||
[ ]
|
|
||||||
++ lib.optionals stdenv.isLinux [
|
|
||||||
libappindicator-gtk3
|
|
||||||
glib-networking
|
|
||||||
];
|
|
||||||
|
|
||||||
overrideMain =
|
overrideMain =
|
||||||
{ ... }:
|
{ ... }:
|
||||||
@@ -124,23 +167,104 @@
|
|||||||
cp -r packaging/files/usr/lib $out/lib
|
cp -r packaging/files/usr/lib $out/lib
|
||||||
cp -r packaging/files/usr/libexec $out/libexec
|
cp -r packaging/files/usr/libexec $out/libexec
|
||||||
|
|
||||||
# Change the `/usr/bin/gpclient` path in the desktop file
|
${rewriteSourceInstallPaths}
|
||||||
substituteInPlace $out/share/applications/gpgui.desktop \
|
|
||||||
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
|
||||||
|
|
||||||
substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \
|
|
||||||
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
|
||||||
|
|
||||||
substituteInPlace $out/libexec/gpclient/hipreport.sh \
|
|
||||||
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
|
||||||
|
|
||||||
# Change the `/usr/bin/gpservice` path in the polkit policy file
|
|
||||||
substituteInPlace $out/share/polkit-1/actions/com.yuezk.gpgui.policy \
|
|
||||||
--replace-fail /usr/bin/gpservice $out/bin/gpservice
|
|
||||||
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
prebuiltFiles = pkgs.stdenv.mkDerivation {
|
||||||
|
inherit pname version;
|
||||||
|
|
||||||
|
src = binaryPackage;
|
||||||
|
dontBuild = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = with pkgs; [
|
||||||
|
autoPatchelfHook
|
||||||
|
wrapGAppsHook4
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = linuxBuildInputs;
|
||||||
|
runtimeDependencies = linuxRuntimeDependencies;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out
|
||||||
|
cp -r artifacts/usr/bin $out/bin
|
||||||
|
cp -r artifacts/usr/libexec $out/libexec
|
||||||
|
cp -r artifacts/usr/share $out/share
|
||||||
|
|
||||||
|
if [ -d artifacts/usr/lib ]; then
|
||||||
|
cp -r artifacts/usr/lib $out/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
prebuiltCommand =
|
||||||
|
binaryName:
|
||||||
|
pkgs.buildFHSEnv {
|
||||||
|
name = binaryName;
|
||||||
|
targetPkgs =
|
||||||
|
pkgs:
|
||||||
|
[
|
||||||
|
prebuiltFiles
|
||||||
|
]
|
||||||
|
++ linuxBuildInputs
|
||||||
|
++ linuxRuntimeDependencies;
|
||||||
|
runScript = "/usr/bin/${binaryName}";
|
||||||
|
};
|
||||||
|
|
||||||
|
prebuiltCommands = {
|
||||||
|
gpclient = prebuiltCommand "gpclient";
|
||||||
|
gpservice = prebuiltCommand "gpservice";
|
||||||
|
gpauth = prebuiltCommand "gpauth";
|
||||||
|
gpgui = prebuiltCommand "gpgui";
|
||||||
|
gpgui-helper = prebuiltCommand "gpgui-helper";
|
||||||
|
};
|
||||||
|
|
||||||
|
prebuilt = pkgs.stdenv.mkDerivation {
|
||||||
|
inherit pname version;
|
||||||
|
|
||||||
|
dontUnpack = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/bin
|
||||||
|
ln -s ${prebuiltCommands.gpclient}/bin/gpclient $out/bin/gpclient
|
||||||
|
ln -s ${prebuiltCommands.gpservice}/bin/gpservice $out/bin/gpservice
|
||||||
|
ln -s ${prebuiltCommands.gpauth}/bin/gpauth $out/bin/gpauth
|
||||||
|
ln -s ${prebuiltCommands.gpgui}/bin/gpgui $out/bin/gpgui
|
||||||
|
ln -s ${prebuiltCommands."gpgui-helper"}/bin/gpgui-helper $out/bin/gpgui-helper
|
||||||
|
|
||||||
|
cp -r ${prebuiltFiles}/libexec $out/libexec
|
||||||
|
cp -r ${prebuiltFiles}/share $out/share
|
||||||
|
|
||||||
|
if [ -d ${prebuiltFiles}/lib ]; then
|
||||||
|
cp -r ${prebuiltFiles}/lib $out/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
${rewriteHostInstallPaths}
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
# For `nix build`
|
||||||
|
packages =
|
||||||
|
{
|
||||||
|
fromSource = fromSource;
|
||||||
|
}
|
||||||
|
// lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||||
|
default = prebuilt;
|
||||||
|
prebuilt = prebuilt;
|
||||||
|
}
|
||||||
|
// lib.optionalAttrs (!pkgs.stdenv.isLinux) {
|
||||||
|
default = fromSource;
|
||||||
|
};
|
||||||
|
|
||||||
apps.default = {
|
apps.default = {
|
||||||
type = "app";
|
type = "app";
|
||||||
program = "${self.packages.${system}.default}/bin/gpclient";
|
program = "${self.packages.${system}.default}/bin/gpclient";
|
||||||
|
|||||||
@@ -73,18 +73,26 @@ release_url() {
|
|||||||
source_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect-$version.tar.gz")")"
|
source_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect-$version.tar.gz")")"
|
||||||
gpgui_x86_64_hash="$(prefetch_hash "$(release_url "gpgui_x86_64.bin.tar.xz")")"
|
gpgui_x86_64_hash="$(prefetch_hash "$(release_url "gpgui_x86_64.bin.tar.xz")")"
|
||||||
gpgui_aarch64_hash="$(prefetch_hash "$(release_url "gpgui_aarch64.bin.tar.xz")")"
|
gpgui_aarch64_hash="$(prefetch_hash "$(release_url "gpgui_aarch64.bin.tar.xz")")"
|
||||||
|
binary_x86_64_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect_${version}_x86_64.bin.tar.xz")")"
|
||||||
|
binary_aarch64_hash="$(prefetch_hash "$(release_url "globalprotect-openconnect_${version}_aarch64.bin.tar.xz")")"
|
||||||
|
|
||||||
SOURCE_HASH="$source_hash" \
|
SOURCE_HASH="$source_hash" \
|
||||||
GPGUI_X86_64_HASH="$gpgui_x86_64_hash" \
|
GPGUI_X86_64_HASH="$gpgui_x86_64_hash" \
|
||||||
GPGUI_AARCH64_HASH="$gpgui_aarch64_hash" \
|
GPGUI_AARCH64_HASH="$gpgui_aarch64_hash" \
|
||||||
|
BINARY_X86_64_HASH="$binary_x86_64_hash" \
|
||||||
|
BINARY_AARCH64_HASH="$binary_aarch64_hash" \
|
||||||
perl -0pi -e '
|
perl -0pi -e '
|
||||||
s|(url = "https://github\.com/yuezk/GlobalProtect-openconnect/releases/download/v\$\{version\}/globalprotect-openconnect-\$\{version\}\.tar\.gz";\n\s*hash = ")[^"]+(";)|$1 . $ENV{"SOURCE_HASH"} . $2|e;
|
s|(url = "https://github\.com/yuezk/GlobalProtect-openconnect/releases/download/v\$\{version\}/globalprotect-openconnect-\$\{version\}\.tar\.gz";\n\s*hash = ")[^"]+(";)|$1 . $ENV{"SOURCE_HASH"} . $2|e;
|
||||||
s|(x86_64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_X86_64_HASH"} . $2|e;
|
s|(gpguiHashes = \{\n\s*x86_64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_X86_64_HASH"} . $2|e;
|
||||||
s|(aarch64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_AARCH64_HASH"} . $2|e;
|
s|(gpguiHashes = \{\n\s*x86_64 = "[^"]+";\n\s*aarch64 = ")[^"]+(";)|$1 . $ENV{"GPGUI_AARCH64_HASH"} . $2|e;
|
||||||
|
s|(binaryHashes = \{\n\s*x86_64 = ")[^"]+(";)|$1 . $ENV{"BINARY_X86_64_HASH"} . $2|e;
|
||||||
|
s|(binaryHashes = \{\n\s*x86_64 = "[^"]+";\n\s*aarch64 = ")[^"]+(";)|$1 . $ENV{"BINARY_AARCH64_HASH"} . $2|e;
|
||||||
' "$FLAKE_FILE"
|
' "$FLAKE_FILE"
|
||||||
|
|
||||||
grep -F "$source_hash" "$FLAKE_FILE" > /dev/null
|
grep -F "$source_hash" "$FLAKE_FILE" > /dev/null
|
||||||
grep -F "$gpgui_x86_64_hash" "$FLAKE_FILE" > /dev/null
|
grep -F "$gpgui_x86_64_hash" "$FLAKE_FILE" > /dev/null
|
||||||
grep -F "$gpgui_aarch64_hash" "$FLAKE_FILE" > /dev/null
|
grep -F "$gpgui_aarch64_hash" "$FLAKE_FILE" > /dev/null
|
||||||
|
grep -F "$binary_x86_64_hash" "$FLAKE_FILE" > /dev/null
|
||||||
|
grep -F "$binary_aarch64_hash" "$FLAKE_FILE" > /dev/null
|
||||||
|
|
||||||
echo "Updated flake.nix hashes for v$version"
|
echo "Updated flake.nix hashes for v$version"
|
||||||
Reference in new issue
Block a user