Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refinements for external auth support #1049

Merged
merged 118 commits into from
Dec 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
f713ea1
updates to lib
dovholuknf Nov 21, 2024
e045436
updates to .h files
dovholuknf Nov 21, 2024
7e1bf48
updates to netif_driver and remove config-utils.c
dovholuknf Nov 21, 2024
590c37a
updates to config_dir for service, remove CMakeList refs to removed f…
dovholuknf Nov 21, 2024
0553888
add include for remove_nrpt_rules. remove backup file
dovholuknf Nov 21, 2024
eee306f
changes from testing, normalize identifier on windows and prepare for…
dovholuknf Nov 21, 2024
eab1e34
implement new enrollment features, bug scrub/hunt related changes
dovholuknf Nov 21, 2024
916dbf1
updates after more testing
dovholuknf Nov 23, 2024
c325941
remove extraneous fprintf
dovholuknf Nov 25, 2024
44cce21
changes after self-review on pr
dovholuknf Nov 25, 2024
c13e0a4
fix the build
dovholuknf Nov 26, 2024
08963bc
const char and fix config_dir reference
dovholuknf Nov 26, 2024
224cb88
go back to using lwip-contrib project (#1050)
scareything Nov 26, 2024
d55ae0e
remove config_path. it was never set. continue to use identifier whic…
dovholuknf Dec 2, 2024
5ee5dc7
Merge pull request #1052 from openziti/fix-newAddress-event
dovholuknf Dec 2, 2024
709f04c
go back to using lwip-contrib project (#1050)
scareything Nov 26, 2024
fead9bb
remove config_path. it was never set. continue to use identifier whic…
dovholuknf Dec 2, 2024
f2e22df
updates from review
dovholuknf Dec 2, 2024
7548522
whitespace and NULL
dovholuknf Dec 3, 2024
04ef0f1
add get_name to netif driver per review request
dovholuknf Dec 3, 2024
d78b7f5
bump [email protected]
ekoby Dec 3, 2024
e61e7ea
ziti config event update
ekoby Dec 3, 2024
3f08802
fix memory leaks
ekoby Dec 3, 2024
cf0cc30
updates from review
dovholuknf Dec 3, 2024
2c85a88
Merge pull request #1053 from openziti/add-identity-from-url-cert-key…
dovholuknf Dec 3, 2024
8cc6a6f
Merge pull request #1055 from openziti/sdk-update
ekoby Dec 4, 2024
5703f76
address PR comments
dovholuknf Dec 4, 2024
18f559b
put the old code back
dovholuknf Dec 4, 2024
983c5c8
let local testers supply a ZET binary instead of building it every time
qrkourier Dec 4, 2024
659758e
let ZET CI test runs use the binary already built by cmake.yml instea…
qrkourier Dec 4, 2024
cde2648
Merge pull request #1057 from openziti/zet-test-download-and-use-binary
qrkourier Dec 4, 2024
985cf3f
fix concurrency deadlock
qrkourier Dec 4, 2024
8ca0b9d
updates to lib
dovholuknf Nov 21, 2024
6f45945
updates to .h files
dovholuknf Nov 21, 2024
9108fdd
updates to netif_driver and remove config-utils.c
dovholuknf Nov 21, 2024
bb78730
updates to config_dir for service, remove CMakeList refs to removed f…
dovholuknf Nov 21, 2024
78c5358
add include for remove_nrpt_rules. remove backup file
dovholuknf Nov 21, 2024
fb025ed
changes from testing, normalize identifier on windows and prepare for…
dovholuknf Nov 21, 2024
262b4a9
implement new enrollment features, bug scrub/hunt related changes
dovholuknf Nov 21, 2024
54660a8
updates after more testing
dovholuknf Nov 23, 2024
35aa8c0
remove extraneous fprintf
dovholuknf Nov 25, 2024
d9f27cb
changes after self-review on pr
dovholuknf Nov 25, 2024
a6e0731
fix the build
dovholuknf Nov 26, 2024
36c98ad
const char and fix config_dir reference
dovholuknf Nov 26, 2024
09c8d21
updates from review - rebased with main
dovholuknf Dec 2, 2024
eb3f3de
whitespace and NULL
dovholuknf Dec 3, 2024
276d931
add get_name to netif driver per review request
dovholuknf Dec 3, 2024
5f0d30f
updates from review
dovholuknf Dec 3, 2024
7ef4cd1
address PR comments
dovholuknf Dec 4, 2024
3fa932c
put the old code back
dovholuknf Dec 4, 2024
6d7450b
rebase with main
dovholuknf Dec 5, 2024
07af59c
clarify names of GH Actions workflows and jobs
qrkourier Dec 5, 2024
dd5ad19
Merge pull request #1058 from openziti/remove-concurrency-constraint-…
qrkourier Dec 5, 2024
d9ae90d
Merge pull request #1059 from openziti/name-gha-workflows-and-jobs
qrkourier Dec 5, 2024
6e5fe29
Merge pull request #1056 from openziti/zet-test-override-binary-path
qrkourier Dec 5, 2024
ece6de1
refactor jwtFilename to identityFilename
dovholuknf Dec 6, 2024
be00417
use FILENAME_MAX for now
dovholuknf Dec 6, 2024
0dab3ea
update [email protected]
ekoby Dec 10, 2024
34f75ed
fix memory leak
ekoby Dec 10, 2024
dc78295
Merge pull request #1062 from openziti/update-sdk-1.3.1
ekoby Dec 10, 2024
03ef7fa
update [email protected]
ekoby Dec 10, 2024
b447e17
Merge pull request #1063 from openziti/update-sdk-1.3.2
ekoby Dec 10, 2024
7ce58cc
move config file update from tunneler lib to ZET
ekoby Dec 11, 2024
448a171
make config raw json
ekoby Dec 11, 2024
cfc7748
FILENAME_MAX -> PATH_MAX
dovholuknf Dec 11, 2024
077987f
missed one
dovholuknf Dec 11, 2024
8e12b50
Merge pull request #1065 from openziti/add-identity-from-url-cert-key…
dovholuknf Dec 11, 2024
7718bd5
Merge pull request #1064 from openziti/move-file-update-to-zet
ekoby Dec 11, 2024
3ad468a
refactor jwtFilename to identityFilename
dovholuknf Dec 6, 2024
a0be754
use FILENAME_MAX for now
dovholuknf Dec 6, 2024
c83d94a
Merge branch 'add-identity-from-url-cert-key-identityFilename' of git…
dovholuknf Dec 11, 2024
d576ca5
Merge pull request #1061 from openziti/add-identity-from-url-cert-key…
dovholuknf Dec 11, 2024
912136d
updates to lib
dovholuknf Nov 21, 2024
e6742df
rebase - updates to .h files
dovholuknf Nov 21, 2024
68e7ae1
rebase - updates to netif_driver and remove config-utils.c
dovholuknf Nov 21, 2024
22e9fff
updates to config_dir for service, remove CMakeList refs to removed f…
dovholuknf Nov 21, 2024
d4fca37
add include for remove_nrpt_rules. remove backup file
dovholuknf Nov 21, 2024
e58a0e2
changes from testing, normalize identifier on windows and prepare for…
dovholuknf Nov 21, 2024
8a99ae7
implement new enrollment features, bug scrub/hunt related changes
dovholuknf Nov 21, 2024
0e6ff2a
updates after more testing
dovholuknf Nov 23, 2024
9e4381d
remove extraneous fprintf
dovholuknf Nov 25, 2024
5771db3
changes after self-review on pr
dovholuknf Nov 25, 2024
0103961
fix the build
dovholuknf Nov 26, 2024
2ab1fa0
const char and fix config_dir reference
dovholuknf Nov 26, 2024
7ab33f0
updates from review - rebased with main
dovholuknf Dec 2, 2024
0913827
whitespace and NULL
dovholuknf Dec 3, 2024
24eafbc
add get_name to netif driver per review request
dovholuknf Dec 3, 2024
38dae9e
updates from review
dovholuknf Dec 3, 2024
2856eb8
address PR comments
dovholuknf Dec 4, 2024
01acb1f
put the old code back
dovholuknf Dec 4, 2024
3e9b6be
updates to lib
dovholuknf Nov 21, 2024
cea4433
rebase - updates to netif_driver and remove config-utils.c
dovholuknf Nov 21, 2024
8598a75
rebase - implement new enrollment features, bug scrub/hunt related ch…
dovholuknf Nov 21, 2024
f07f238
updates after more testing
dovholuknf Nov 23, 2024
00159b6
remove extraneous fprintf
dovholuknf Nov 25, 2024
c897d4e
fix the build
dovholuknf Nov 26, 2024
a2423ce
rebase - remove config_path. it was never set. continue to use identi…
dovholuknf Dec 2, 2024
8d93e50
updates from review
dovholuknf Dec 2, 2024
ba8f015
rebase - add get_name to netif driver per review request
dovholuknf Dec 3, 2024
96caf86
updates from review
dovholuknf Dec 3, 2024
6fbb290
address PR comments
dovholuknf Dec 4, 2024
8f430ef
put the old code back
dovholuknf Dec 4, 2024
be8411c
FILENAME_MAX -> PATH_MAX
dovholuknf Dec 11, 2024
b8d8648
missed one
dovholuknf Dec 11, 2024
352f529
refactor jwtFilename to identityFilename
dovholuknf Dec 6, 2024
99954c2
use FILENAME_MAX for now
dovholuknf Dec 6, 2024
32b2056
rebase - refactor jwtFilename to identityFilename
dovholuknf Dec 6, 2024
3a59c2d
use FILENAME_MAX for now
dovholuknf Dec 6, 2024
801b74c
rebased Merge branch 'add-identity-from-url-cert-key' of github.com:o…
dovholuknf Dec 11, 2024
aaf8bc6
missed file and cmakelists update during merge
dovholuknf Dec 11, 2024
13ad7fa
continuing to try to fix the rebase
dovholuknf Dec 11, 2024
1180d67
remove duplicated function. declare PATH_MAX if not declared
dovholuknf Dec 11, 2024
cc3d1da
remove another mismerged func
dovholuknf Dec 11, 2024
23bc4c7
continuing to attempt to appease the vs2022 compiler
dovholuknf Dec 11, 2024
3d68242
perhaps _WIN32 is not declared on vs2022 arm64
dovholuknf Dec 11, 2024
8f3dc83
it'd be easier if i had an arm64 windows machine
dovholuknf Dec 11, 2024
64a18b9
let's see how MAX_PATH works.... :/
dovholuknf Dec 11, 2024
5b2c44e
fix -i usage
dovholuknf Dec 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix -i usage
dovholuknf committed Dec 12, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
ripcurlx Christoph Atteneder
commit 5b2c44e993ed0b434ac90ee9cb932b82a5448e00
16 changes: 6 additions & 10 deletions programs/ziti-edge-tunnel/ziti-edge-tunnel.c
Original file line number Diff line number Diff line change
@@ -419,8 +419,6 @@ static void load_id_cb(const tunnel_result *res, void *ctx) {
} else {
ZITI_LOG(ERROR, "identity[%s] failed to load: %s", inst->cfg, res->error);
}
free(inst->cfg);
free(inst);
}

static void load_identities_complete(uv_work_t * wr, int status) {
@@ -429,25 +427,23 @@ static void load_identities_complete(uv_work_t * wr, int status) {
struct cfg_instance_s *inst = LIST_FIRST(&load_list);
LIST_REMOVE(inst, _next);

if (uses_config_dir) {
create_or_get_tunnel_identity(inst->cfg, inst->cfg);
}
create_or_get_tunnel_identity(inst->cfg, inst->cfg);

tunnel_identity *id = find_tunnel_identity(inst->cfg);
if(id != NULL) {
CMD_CTRL->load_identity(NULL, inst->cfg, !id->Active, get_api_page_size(), load_id_cb, inst);
} else {
ZITI_LOG(WARN, "identity not found? %s", inst->cfg);
}

identity_loaded = true;
}

if (identity_loaded) {
start_metrics_timer(wr->loop);
}

// should be the last line in this function as it calls the mutex/lock
save_tunnel_status_to_file();
if(uses_config_dir) {
// should be the last line in this function as it calls the mutex/lock
save_tunnel_status_to_file();
}
}

static void on_event(const base_event *ev) {