From d7f79c86fe8c13872f9cc9b202b847888cfa0e12 Mon Sep 17 00:00:00 2001 From: Jay Gabriels Date: Thu, 13 Jan 2022 08:47:10 -0800 Subject: [PATCH] Fix gitlab token length requirements (#176) --- CHANGELOG.md | 1 + configs/configs.go | 5 ++++- configs/configs_test.go | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f44716..fc92b07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) ### Deprecated ### Removed ### Fixed +- Gitlab token length requirements; thanks @dschafhauser ### Security ## [1.7.5] - 12/11/21 diff --git a/configs/configs.go b/configs/configs.go index cd3c96c..ae80c01 100644 --- a/configs/configs.go +++ b/configs/configs.go @@ -228,8 +228,11 @@ func VerifyTokenSet() error { token = os.Getenv("GHORG_GITLAB_TOKEN") if strings.HasPrefix(token, "glpat-") { tokenLength = 26 + } else if len(token) > 0 { + // gitlab admins can change token prefixes so we dont know the exact length + tokenLength = len(token) } else { - tokenLength = 20 + tokenLength = -1 } } diff --git a/configs/configs_test.go b/configs/configs_test.go index c7ac5a2..31e8101 100644 --- a/configs/configs_test.go +++ b/configs/configs_test.go @@ -26,7 +26,7 @@ func TestVerifyTokenSet(t *testing.T) { err := configs.VerifyTokenSet() if err != configs.ErrNoGitLabToken { - tt.Errorf("Expected ErrNoGitHubTokenError, got: %v", err) + tt.Errorf("Expected ErrNoGitLabTokenError, got: %v", err) } })