From 88eb7a40dee2d4207d8423c35f1ed976405c62d9 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 28 Feb 2024 11:12:39 -0500 Subject: [PATCH 1/4] corrected 'environments.json' path in regenerate token dialog --- CHANGELOG.md | 4 ++++ ui/src/console/detail/account/actions/RegenerateToken.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 495dd324..c408e8e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.4.26 + +FIX: The regenerate account token dialog incorrectly specified the path `${HOME}/.zrok/environments.yml`. This was corrected to be `${HOME}/.zrok/environments.json` + ## v0.4.25 FEATURE: New action in the web console that allows changing the password of the logged-in account (https://github.com/openziti/zrok/issues/148) diff --git a/ui/src/console/detail/account/actions/RegenerateToken.js b/ui/src/console/detail/account/actions/RegenerateToken.js index f41ce601..b63022e8 100644 --- a/ui/src/console/detail/account/actions/RegenerateToken.js +++ b/ui/src/console/detail/account/actions/RegenerateToken.js @@ -49,7 +49,7 @@ const RegenerateToken = (props) => {

You will need to update each of - your ${HOME}/.zrok/environments.yml files + your ${HOME}/.zrok/environments.json files with your new token to allow them to continue working!

From 4fe29d73f9397a71fef9b2b55e315cc4815e4030 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 28 Feb 2024 11:23:20 -0500 Subject: [PATCH 2/4] automatically set the target of a 'socks' backend to the text 'socks' --- cmd/zrok/sharePrivate.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/zrok/sharePrivate.go b/cmd/zrok/sharePrivate.go index 7c01e31a..09d6baee 100644 --- a/cmd/zrok/sharePrivate.go +++ b/cmd/zrok/sharePrivate.go @@ -99,6 +99,7 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) { if len(args) != 0 { tui.Error("the 'socks' backend mode does not expect ", nil) } + target = "socks" default: tui.Error(fmt.Sprintf("invalid backend mode '%v'; expected {proxy, web, tcpTunnel, udpTunnel, caddy, drive}", cmd.backendMode), nil) From 0d66e230e634c6a4307d5101cead0e760d3ae7fd Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 28 Feb 2024 11:24:50 -0500 Subject: [PATCH 3/4] account action text improvements --- ui/src/console/detail/account/ActionsTab.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/src/console/detail/account/ActionsTab.js b/ui/src/console/detail/account/ActionsTab.js index cf825dbe..4a3a3605 100644 --- a/ui/src/console/detail/account/ActionsTab.js +++ b/ui/src/console/detail/account/ActionsTab.js @@ -16,7 +16,7 @@ const ActionsTab = (props) => {

Change Password?

-

Change your password here. Note that this will not log you out of any already logged in sessions.

+

Change the password used to log into the zrok web console.

@@ -24,20 +24,20 @@ const ActionsTab = (props) => {
-

Regenerate your account token (DANGER!)?

+

DANGER: Regenerate your account token?

Regenerating your account token will stop all environments and shares from operating properly!

- You will need to manually edit your + You will need to manually edit your ${HOME}/.zrok/environment.json files (in each environment) to use the new - zrok_token . Updating these files will restore the functionality of your environments. + zrok_token. Updating these files will restore the functionality of your environments.

Alternatively, you can just zrok disable any enabled environments and re-enable using the - new account token. Running zrok disable will delete your environments and + new account token. Running zrok disable will delete your environments and any shares they contain (including reserved shares). So if you have environments and reserved shares you - need to preserve, your best bet is to update the zrok_token in those environments as + need to preserve, your best option is to update the zrok_token in those environments as described above.

From 079b93604ae341bb4a7e3926f9e12baf66172d4a Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 28 Feb 2024 11:26:02 -0500 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c408e8e9..c0d5f06c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ ## v0.4.26 -FIX: The regenerate account token dialog incorrectly specified the path `${HOME}/.zrok/environments.yml`. This was corrected to be `${HOME}/.zrok/environments.json` +CHANGE: The target for a `socks` share is automatically set to `socks` to improve web console display. + +CHANGE: Enhancements to the look and feel of the account actions tab in the web console. Textual improvements. + +FIX: The regenerate account token dialog incorrectly specified the path `${HOME}/.zrok/environments.yml`. This, was corrected to be `${HOME}/.zrok/environments.json`. ## v0.4.25