Merge pull request #247 from openziti/tsdk.next

update [email protected]
openziti · Sep 24, 2024 · bb49871 · bb49871
2 parents 80869c3 + 2131b7d
commit bb49871
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/deps/ziti-tunnel-sdk-c b/deps/ziti-tunnel-sdk-c
diff --git a/lib/Ziti.swift b/lib/Ziti.swift
@@ -453,8 +453,7 @@ import CZitiPrivate
 
         ziti_log_init_wrapper(loop)
 
-        var zitiOpts = ziti_options(config: nil,
-                                disabled: id.startDisabled ?? false,
+        var zitiOpts = ziti_options(disabled: id.startDisabled ?? false,
                                 config_types: ziti_all_configs,
                                 api_page_size: 25,
                                 refresh_interval: refresh_interval,

diff --git a/lib/ZitiEvent.swift b/lib/ZitiEvent.swift
@@ -220,16 +220,24 @@ import CZitiPrivate
         @objc public let audience:String
 
         /// Claim
-        @objc public let claim:String
-
-        init(_ cSigner:ziti_jwt_signer) {
-            id = cSigner.name != nil ? String(cString: cSigner.id) : ""
-            name = cSigner.name != nil ? String(cString: cSigner.name) : ""
-            enabled = cSigner.enabled
-            providerUrl = cSigner.provider_url != nil ? String(cString: cSigner.provider_url) : ""
-            clientId = cSigner.client_id != nil ? String(cString: cSigner.client_id) : ""
-            audience = cSigner.audience != nil ? String(cString: cSigner.audience) : ""
-            claim = cSigner.claim != nil ? String(cString: cSigner.claim) : ""
+        @objc public var scopes:[String]?
+
+        init(_ cSigner:UnsafeMutablePointer<ziti_jwt_signer>) {
+            id = cSigner.pointee.id != nil ? String(cString: cSigner.pointee.id) : ""
+            name = cSigner.pointee.name != nil ? String(cString: cSigner.pointee.name) : ""
+            enabled = cSigner.pointee.enabled
+            providerUrl = cSigner.pointee.provider_url != nil ? String(cString: cSigner.pointee.provider_url) : ""
+            clientId = cSigner.pointee.client_id != nil ? String(cString: cSigner.pointee.client_id) : ""
+            audience = cSigner.pointee.audience != nil ? String(cString: cSigner.pointee.audience) : ""
+            scopes = []
+            var i = model_list_iterator(&(cSigner.pointee.scopes))
+            while i != nil {
+                let scopePtr = model_list_it_element(i)
+                if let scope = UnsafeMutablePointer<CChar>(OpaquePointer(scopePtr)) {
+                    scopes?.append(String(scope.pointee))
+                }
+                i = model_list_it_next(i)
+            }
         }
     }
+7 −2		.github/workflows/cpack.yml
+9 −8		.github/workflows/promote-downstreams.yml
+28 −13		.github/workflows/publish-container-images.yml
+9 −12		.github/workflows/release.yml
+32 −0		.github/workflows/test-deployments.yml
+0 −25		CHANGELOG.md
+3 −3		CMakeLists.txt
+10 −18		RELEASING.md
+1 −1		deps/CMakeLists.txt
+0 −58		docker/Dockerfile.base
+0 −45		docker/Dockerfile.linux-cross-build
+0 −39		docker/Dockerfile.linux-native-build
+24 −248		docker/README.md
+10 −0		docker/compose.host.yml
+15 −0		docker/compose.intercept.yml
+98 −0		docker/compose.test.yml
+0 −76		docker/docker-compose.yml
+169 −0		docker/docker.test.bash
+0 −83		docker/fetch-github-releases.sh
+0 −87		docker/linux-cross-build.sh
+0 −45		docker/linux-native-build.sh
+38 −0		docker/ziti-edge-tunnel.Dockerfile
+0 −33		docker/ziti-host-deployment.yaml
+0 −0		docker/ziti-host.Dockerfile
+0 −44		docker/ziti-tun-daemonset.yaml
+11 −1		lib/ziti-tunnel-cbs/ziti_dns.c
+3 −0		lib/ziti-tunnel-cbs/ziti_tunnel_cbs.c
+1 −1		lib/ziti-tunnel/lwip/lwipopts.h
+14 −6		lib/ziti-tunnel/tunnel_tcp.c
+2 −2		programs/ziti-edge-tunnel/include/windows/windows-scripts.h
+104 −80		programs/ziti-edge-tunnel/netif_driver/windows/tun.c
+1 −1		programs/ziti-edge-tunnel/netif_driver/windows/tun.h
+3 −3		programs/ziti-edge-tunnel/windows-scripts.c
+39 −17		programs/ziti-edge-tunnel/windows/log_utils.c
+1 −1		programs/ziti-edge-tunnel/wintun.cmake
+6 −5		programs/ziti-edge-tunnel/ziti-edge-tunnel.c
+17 −20		scripts/ziti-builder.sh