Merge pull request #214 from mimiro-io/minorFixes

Fix some minor bugs and patch CWE-835
mimiro-io · Nov 4, 2024 · 542ed20 · 542ed20
2 parents 7a4f968 + 65dc899
commit 542ed20
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible
-	github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2 // indirect
+	github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 // indirect
 	github.com/gookit/color v1.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect

diff --git a/go.sum b/go.sum
@@ -76,8 +76,8 @@ github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/gomarkdown/markdown v0.0.0-20191123064959-2c17d62f5098/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
-github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2 h1:yEt5djSYb4iNtmV9iJGVday+i4e9u6Mrn5iP64HH5QM=
-github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
+github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 h1:EcQR3gusLHN46TAD+G+EbaaqJArt5vHhNpXAa12PQf4=
+github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

diff --git a/internal/jobs/operate.go b/internal/jobs/operate.go
@@ -88,7 +88,7 @@ func CmdOperate() *cobra.Command {
 
 			g, _ := errgroup.WithContext(context.Background())
 			g.SetLimit(10) // not sure if needed, but this will limit to 10 requests at once
-			p, _ := pterm.DefaultProgressbar.WithTotal(len(resolvedIds)).WithTitle("Executing operation" + operation).Start()
+			p, _ := pterm.DefaultProgressbar.WithTotal(len(resolvedIds)).WithTitle("Executing operation " + operation).Start()
 			for _, rid := range resolvedIds {
 				id := rid
 				g.Go(func() error {

diff --git a/internal/login/list.go b/internal/login/list.go
@@ -81,9 +81,10 @@ mim login list
 				if data.OauthToken != nil && data.OauthToken.AccessToken != "" {
 					at, err := jwt.ParseString(data.OauthToken.AccessToken, jwt.WithVerify(false), jwt.WithValidate(false))
 					if err != nil {
-						driver.RenderError(err, true)
+						token = err.Error()
+					} else {
+						sub = at.Subject()
 					}
-					sub = at.Subject()
 				}
 
 				out = append(out, []string{