diff options
| author | Jeroen Wijenbergh <jeroen.wijenbergh@geant.org> | 2025-08-25 10:59:37 +0200 |
|---|---|---|
| committer | Jeroen Wijenbergh <jeroen.wijenbergh@geant.org> | 2025-08-25 13:06:41 +0200 |
| commit | 27b95b4911da055fe9b5fb37b5fb4a33eda6b989 (patch) | |
| tree | f6eb1143fa9bd2995d671b71d75c950e2c703660 /internal/util | |
| parent | b4f4f5600298436c63b89f289c318d777300c499 (diff) | |
All: Remove util packages
Was giving linting errors and it's not a good idea anyways
Diffstat (limited to 'internal/util')
| -rw-r--r-- | internal/util/util.go | 44 | ||||
| -rw-r--r-- | internal/util/util_test.go | 45 |
2 files changed, 0 insertions, 89 deletions
diff --git a/internal/util/util.go b/internal/util/util.go deleted file mode 100644 index 97b4151..0000000 --- a/internal/util/util.go +++ /dev/null @@ -1,44 +0,0 @@ -// Package util implements several utility functions that are used across the codebase -package util - -import ( - "fmt" - "net/url" - "os" - "strings" -) - -// EnsureDirectory creates a directory with permission 700. -func EnsureDirectory(dir string) error { - // Create with 700 permissions, read, write, execute only for the owner - err := os.MkdirAll(dir, 0o700) - if err != nil { - return fmt.Errorf("failed to create directory '%s' with error: %w", dir, err) - } - return nil -} - -// ReplaceWAYF replaces an authorization template containing of @RETURN_TO@ and @ORG_ID@ with the authorization URL and the organization ID -// See https://github.com/eduvpn/documentation/blob/dc4d53c47dd7a69e95d6650eec408e16eaa814a2/SERVER_DISCOVERY_SKIP_WAYF.md -func ReplaceWAYF(template string, authURL string, orgID string) string { - // We just return the authURL in the cases where the template is not given or is invalid - if template == "" { - return authURL - } - if !strings.Contains(template, "@RETURN_TO@") { - return authURL - } - if !strings.Contains(template, "@ORG_ID@") { - return authURL - } - // Replace authURL - template = strings.Replace(template, "@RETURN_TO@", url.QueryEscape(authURL), 1) - - // If now there is no more ORG_ID, return as there weren't enough @ symbols - if !strings.Contains(template, "@ORG_ID@") { - return authURL - } - // Replace ORG ID - template = strings.Replace(template, "@ORG_ID@", url.QueryEscape(orgID), 1) - return template -} diff --git a/internal/util/util_test.go b/internal/util/util_test.go deleted file mode 100644 index 827fbe1..0000000 --- a/internal/util/util_test.go +++ /dev/null @@ -1,45 +0,0 @@ -package util - -import "testing" - -func TestReplaceWAYF(t *testing.T) { - // We expect url encoding but the spaces to be correctly replace with a + instead of a %20 - // And we expect that the return to and org_id are correctly replaced - replaced := ReplaceWAYF( - "@RETURN_TO@@ORG_ID@", - "127.0.0.1:8000/&%$3#kM_- ", - "idp-test.nl.org/", - ) - wantReplaced := "127.0.0.1%3A8000%2F%26%25%243%23kM_-++++++++++++idp-test.nl.org%2F" - if replaced != wantReplaced { - t.Fatalf("Got: %s, want: %s", replaced, wantReplaced) - } - - // No RETURN_TO in template - replaced = ReplaceWAYF("@ORG_ID@", "127.0.0.1:8000", "idp-test.nl.org/") - wantReplaced = "127.0.0.1:8000" - if replaced != wantReplaced { - t.Fatalf("Got: %s, want: %s", replaced, wantReplaced) - } - - // NO ORG_ID in template - replaced = ReplaceWAYF("@RETURN_TO@", "127.0.0.1:8000", "idp-test.nl.org") - wantReplaced = "127.0.0.1:8000" - if replaced != wantReplaced { - t.Fatalf("Got: %s, want: %s", replaced, wantReplaced) - } - - // Template is empty - replaced = ReplaceWAYF("", "127.0.0.1:8000", "idp-test.nl.org") - wantReplaced = "127.0.0.1:8000" - if replaced != wantReplaced { - t.Fatalf("Got: %s, want: %s", replaced, wantReplaced) - } - - // Template contains both @RETURN_TO@ and @ORG_ID@ but there is not enough to replace both - replaced = ReplaceWAYF("@RETURN_TO@ORG_ID@", "127.0.0.1:8000", "idp-test.nl.org") - wantReplaced = "127.0.0.1:8000" - if replaced != wantReplaced { - t.Fatalf("Got: %s, want: %s", replaced, wantReplaced) - } -} |
