mirror of
				https://github.com/steveiliop56/tinyauth.git
				synced 2025-10-31 14:15:50 +00:00 
			
		
		
		
	Compare commits
	
		
			89 Commits
		
	
	
		
			refactor/r
			...
			refactor/f
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | a1b6ecdd5d | ||
|   | a5e1ae096b | ||
|   | d3c40bb366 | ||
|   | 8435cbe434 | ||
|   | 77296daef3 | ||
|   | 645c555cf0 | ||
|   | 03af18fd15 | ||
|   | cb8022af91 | ||
|   | 304c920b7b | ||
|   | 6418cbe2ba | ||
|   | 04213836a1 | ||
|   | 659d3561e0 | ||
|   | dbadb096b4 | ||
|   | 44f35af3bf | ||
|   | dfdc656145 | ||
|   | e1d8ce3cb5 | ||
|   | ace22acdb2 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 4979121395 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 97020e6e32 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 9f5a02b9f5 | ||
|   | ef25962a93 | ||
|   | cc3ce93100 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | b44cef2865 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | fda0f7b3ff | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 256f63af05 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 707dcb649d | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 351fe1759d | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | c968b67af4 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 39f6f5392a | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 0102f3146f | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | c3a84dad9a | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 2fc1260163 | ||
|   | 4dacb46a8e | ||
|   | 5f7f88421e | ||
|   | bc941cb248 | ||
|   | 00d15de44f | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | a4f17de0d1 | ||
|   | 6867667de6 | ||
|   | 079886b54c | ||
|   | 19eb8f3064 | ||
|   | 1a13936693 | ||
|   | af26d705cd | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 2d4ceda12f | ||
|   | 4a87af4463 | ||
|   | 88d918d608 | ||
|   | 5854d973ea | ||
|   | f25ab72747 | ||
|   | 2233557990 | ||
|   | d3bec635f8 | ||
|   | 6519644fc1 | ||
|   | 736f65b7b2 | ||
|   | 63d39b5500 | ||
|   | b735ab6f39 | ||
|   | 232c50eaef | ||
|   | 52b12abeb2 | ||
|   | 48b4d78a7c | ||
|   | 8ebed0ac9a | ||
|   | e742603c15 | ||
|   | 3215bb6baa | ||
|   | a11aba72d8 | ||
|   | 10d1b48505 | ||
|   | f73eb9571f | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | da2877a682 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 33cbfef02a | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | c1a6428ed3 | ||
| ![github-actions[bot]](/assets/img/avatar_default.png)  | 2ee7932cba | ||
|   | fe440a6f2e | ||
|   | 0ace88a877 | ||
|   | 476ed6964d | ||
|   | b3dca0429f | ||
|   | 9e4b68112c | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 364f0e221e | ||
|   | 09635666aa | ||
|   | 9f02710114 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 64bdab5e5b | ||
|   | 0f4a6b5924 | ||
|   | c662b9e222 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | a4722db7d7 | ||
|   | f48bb65d7b | ||
|   | 7e604419ab | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 60cd0a216f | ||
|   | ec6e3aa718 | ||
|   | 6dc57ddf0f | ||
|   | f780e81ec2 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 8b70ab47a4 | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | b800359bb2 | ||
|   | 6ec8c9766c | ||
| ![dependabot[bot]](/assets/img/avatar_default.png)  | 4524e3322c | ||
|   | 1941de1125 | 
| @@ -5,7 +5,7 @@ SECRET_FILE=app_secret_file | |||||||
| APP_URL=http://localhost:3000 | APP_URL=http://localhost:3000 | ||||||
| USERS=your_user_password_hash | USERS=your_user_password_hash | ||||||
| USERS_FILE=users_file | USERS_FILE=users_file | ||||||
| COOKIE_SECURE=false | SECURE_COOKIE=false | ||||||
| GITHUB_CLIENT_ID=github_client_id | GITHUB_CLIENT_ID=github_client_id | ||||||
| GITHUB_CLIENT_SECRET=github_client_secret | GITHUB_CLIENT_SECRET=github_client_secret | ||||||
| GITHUB_CLIENT_SECRET_FILE=github_client_secret_file | GITHUB_CLIENT_SECRET_FILE=github_client_secret_file | ||||||
| @@ -25,7 +25,7 @@ GENERIC_NAME=My OAuth | |||||||
| SESSION_EXPIRY=7200 | SESSION_EXPIRY=7200 | ||||||
| LOGIN_TIMEOUT=300 | LOGIN_TIMEOUT=300 | ||||||
| LOGIN_MAX_RETRIES=5 | LOGIN_MAX_RETRIES=5 | ||||||
| LOG_LEVEL=0 | LOG_LEVEL=debug | ||||||
| APP_TITLE=Tinyauth SSO | APP_TITLE=Tinyauth SSO | ||||||
| FORGOT_PASSWORD_MESSAGE=Some message about resetting the password | FORGOT_PASSWORD_MESSAGE=Some message about resetting the password | ||||||
| OAUTH_AUTO_REDIRECT=none | OAUTH_AUTO_REDIRECT=none | ||||||
|   | |||||||
							
								
								
									
										11
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -11,11 +11,7 @@ docker-compose.test* | |||||||
| users.txt | users.txt | ||||||
|  |  | ||||||
| # secret test file | # secret test file | ||||||
| secret.txt | secret* | ||||||
| secret_oauth.txt |  | ||||||
|  |  | ||||||
| # vscode |  | ||||||
| .vscode |  | ||||||
|  |  | ||||||
| # apple stuff | # apple stuff | ||||||
| .DS_Store | .DS_Store | ||||||
| @@ -27,4 +23,7 @@ secret_oauth.txt | |||||||
| tmp | tmp | ||||||
|  |  | ||||||
| # version files | # version files | ||||||
| internal/assets/version | internal/assets/version | ||||||
|  |  | ||||||
|  | # data directory | ||||||
|  | data | ||||||
							
								
								
									
										15
									
								
								.vscode/launch.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								.vscode/launch.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | |||||||
|  | { | ||||||
|  |   "version": "0.2.0", | ||||||
|  |   "configurations": [ | ||||||
|  |     { | ||||||
|  |       "name": "Connect to server", | ||||||
|  |       "type": "go", | ||||||
|  |       "request": "attach", | ||||||
|  |       "mode": "remote", | ||||||
|  |       "remotePath": "/tinyauth", | ||||||
|  |       "port": 4000, | ||||||
|  |       "host": "127.0.0.1", | ||||||
|  |       "debugAdapter": "legacy" | ||||||
|  |     } | ||||||
|  |   ] | ||||||
|  | } | ||||||
| @@ -1,5 +1,5 @@ | |||||||
| # Site builder | # Site builder | ||||||
| FROM oven/bun:1.2.17-alpine AS frontend-builder | FROM oven/bun:1.2.20-alpine AS frontend-builder | ||||||
|  |  | ||||||
| WORKDIR /frontend | WORKDIR /frontend | ||||||
|  |  | ||||||
| @@ -20,7 +20,7 @@ COPY ./frontend/vite.config.ts ./ | |||||||
| RUN bun run build | RUN bun run build | ||||||
|  |  | ||||||
| # Builder | # Builder | ||||||
| FROM golang:1.24-alpine3.21 AS builder | FROM golang:1.25-alpine3.21 AS builder | ||||||
|  |  | ||||||
| ARG VERSION | ARG VERSION | ||||||
| ARG COMMIT_HASH | ARG COMMIT_HASH | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| FROM golang:1.24-alpine3.21 | FROM golang:1.25-alpine3.21 | ||||||
|  |  | ||||||
| WORKDIR /tinyauth | WORKDIR /tinyauth | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										16
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								README.md
									
									
									
									
									
								
							| @@ -23,27 +23,27 @@ Tinyauth is a simple authentication middleware that adds a simple login screen o | |||||||
|  |  | ||||||
| ## Getting Started | ## Getting Started | ||||||
|  |  | ||||||
| You can easily get started with tinyauth by following the guide in the [documentation](https://tinyauth.app/docs/getting-started.html). There is also an available [docker compose](./docker-compose.example.yml) file that has traefik, whoami and tinyauth to demonstrate its capabilities. | You can easily get started with Tinyauth by following the guide in the [documentation](https://tinyauth.app/docs/getting-started.html). There is also an available [docker compose](./docker-compose.example.yml) file that has Traefik, Whoami and Tinyauth to demonstrate its capabilities. | ||||||
|  |  | ||||||
| ## Demo | ## Demo | ||||||
|  |  | ||||||
| If you are still not sure if tinyauth suits your needs you can try out the [demo](https://demo.tinyauth.app). The default username is `user` and the default password is `password`. | If you are still not sure if Tinyauth suits your needs you can try out the [demo](https://demo.tinyauth.app). The default username is `user` and the default password is `password`. | ||||||
|  |  | ||||||
| ## Documentation | ## Documentation | ||||||
|  |  | ||||||
| You can find documentation and guides on all of the available configuration of tinyauth in the [website](https://tinyauth.app). | You can find documentation and guides on all of the available configuration of Tinyauth in the [website](https://tinyauth.app). | ||||||
|  |  | ||||||
| ## Discord | ## Discord | ||||||
|  |  | ||||||
| Tinyauth has a [discord](https://discord.gg/eHzVaCzRRd) server. Feel free to hop in to chat about self-hosting, homelabs and of course tinyauth. See you there! | Tinyauth has a [discord](https://discord.gg/eHzVaCzRRd) server. Feel free to hop in to chat about self-hosting, homelabs and of course Tinyauth. See you there! | ||||||
|  |  | ||||||
| ## Contributing | ## Contributing | ||||||
|  |  | ||||||
| All contributions to the codebase are welcome! If you have any free time feel free to pick up an [Issue](https://github.com/steveiliop56/tinyauth/issues) or add your own missing features. Make sure to check out the [contributing guide](./CONTRIBUTING.md) for instructions on how to get the development server up and running. | All contributions to the codebase are welcome! If you have any free time feel free to pick up an [issue](https://github.com/steveiliop56/tinyauth/issues) or add your own missing features. Make sure to check out the [contributing guide](./CONTRIBUTING.md) for instructions on how to get the development server up and running. | ||||||
|  |  | ||||||
| ## Localization | ## Localization | ||||||
|  |  | ||||||
| If you would like to help translate tinyauth into more languages, visit the [Crowdin](https://crowdin.com/project/tinyauth) page. | If you would like to help translate Tinyauth into more languages, visit the [Crowdin](https://crowdin.com/project/tinyauth) page. | ||||||
|  |  | ||||||
| ## License | ## License | ||||||
|  |  | ||||||
| @@ -51,9 +51,9 @@ Tinyauth is licensed under the GNU General Public License v3.0. TL;DR — You ma | |||||||
|  |  | ||||||
| ## Sponsors | ## Sponsors | ||||||
|  |  | ||||||
| Thanks a lot to the following people for providing me with more coffee: | A big thank you to the following people for providing me with more coffee: | ||||||
|  |  | ||||||
| <!-- sponsors --><a href="https://github.com/erwinkramer"><img src="https://github.com/erwinkramer.png" width="64px" alt="User avatar: erwinkramer" /></a>  <a href="https://github.com/nicotsx"><img src="https://github.com/nicotsx.png" width="64px" alt="User avatar: nicotsx" /></a>  <a href="https://github.com/SimpleHomelab"><img src="https://github.com/SimpleHomelab.png" width="64px" alt="User avatar: SimpleHomelab" /></a>  <a href="https://github.com/jmadden91"><img src="https://github.com/jmadden91.png" width="64px" alt="User avatar: jmadden91" /></a>  <a href="https://github.com/tribor"><img src="https://github.com/tribor.png" width="64px" alt="User avatar: tribor" /></a>  <a href="https://github.com/eliasbenb"><img src="https://github.com/eliasbenb.png" width="64px" alt="User avatar: eliasbenb" /></a>  <!-- sponsors --> | <!-- sponsors --><a href="https://github.com/erwinkramer"><img src="https://github.com/erwinkramer.png" width="64px" alt="User avatar: erwinkramer" /></a>  <a href="https://github.com/nicotsx"><img src="https://github.com/nicotsx.png" width="64px" alt="User avatar: nicotsx" /></a>  <a href="https://github.com/SimpleHomelab"><img src="https://github.com/SimpleHomelab.png" width="64px" alt="User avatar: SimpleHomelab" /></a>  <a href="https://github.com/jmadden91"><img src="https://github.com/jmadden91.png" width="64px" alt="User avatar: jmadden91" /></a>  <a href="https://github.com/tribor"><img src="https://github.com/tribor.png" width="64px" alt="User avatar: tribor" /></a>  <a href="https://github.com/eliasbenb"><img src="https://github.com/eliasbenb.png" width="64px" alt="User avatar: eliasbenb" /></a>  <a href="https://github.com/afunworm"><img src="https://github.com/afunworm.png" width="64px" alt="User avatar: afunworm" /></a>  <!-- sponsors --> | ||||||
|  |  | ||||||
| ## Acknowledgements | ## Acknowledgements | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								air.toml
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								air.toml
									
									
									
									
									
								
							| @@ -2,9 +2,9 @@ root = "/tinyauth" | |||||||
| tmp_dir = "tmp" | tmp_dir = "tmp" | ||||||
|  |  | ||||||
| [build] | [build] | ||||||
| pre_cmd = ["mkdir -p internal/assets/dist", "echo 'backend running' > internal/assets/dist/index.html"] | pre_cmd = ["mkdir -p internal/assets/dist", "echo 'backend running' > internal/assets/dist/index.html", "go install github.com/go-delve/delve/cmd/dlv@v1.25.0"] | ||||||
| cmd = "CGO_ENABLED=0 go build -o ./tmp/tinyauth ." | cmd = "CGO_ENABLED=0 go build -gcflags=\"all=-N -l\" -o tmp/tinyauth ." | ||||||
| bin = "tmp/tinyauth" | bin = "/go/bin/dlv --listen :4000 --headless=true --api-version=2 --accept-multiclient --log=true exec tmp/tinyauth --continue --check-go-version=false" | ||||||
| include_ext = ["go"] | include_ext = ["go"] | ||||||
| exclude_dir = ["internal/assets/dist"] | exclude_dir = ["internal/assets/dist"] | ||||||
| exclude_regex = [".*_test\\.go"] | exclude_regex = [".*_test\\.go"] | ||||||
|   | |||||||
							
								
								
									
										296
									
								
								cmd/root.go
									
									
									
									
									
								
							
							
						
						
									
										296
									
								
								cmd/root.go
									
									
									
									
									
								
							| @@ -1,21 +1,11 @@ | |||||||
| package cmd | package cmd | ||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"errors" |  | ||||||
| 	"fmt" |  | ||||||
| 	"os" |  | ||||||
| 	"strings" | 	"strings" | ||||||
| 	"time" |  | ||||||
| 	totpCmd "tinyauth/cmd/totp" | 	totpCmd "tinyauth/cmd/totp" | ||||||
| 	userCmd "tinyauth/cmd/user" | 	userCmd "tinyauth/cmd/user" | ||||||
| 	"tinyauth/internal/auth" | 	"tinyauth/internal/bootstrap" | ||||||
| 	"tinyauth/internal/constants" | 	"tinyauth/internal/config" | ||||||
| 	"tinyauth/internal/docker" |  | ||||||
| 	"tinyauth/internal/handlers" |  | ||||||
| 	"tinyauth/internal/hooks" |  | ||||||
| 	"tinyauth/internal/providers" |  | ||||||
| 	"tinyauth/internal/server" |  | ||||||
| 	"tinyauth/internal/types" |  | ||||||
| 	"tinyauth/internal/utils" | 	"tinyauth/internal/utils" | ||||||
|  |  | ||||||
| 	"github.com/go-playground/validator/v10" | 	"github.com/go-playground/validator/v10" | ||||||
| @@ -30,233 +20,117 @@ var rootCmd = &cobra.Command{ | |||||||
| 	Short: "The simplest way to protect your apps with a login screen.", | 	Short: "The simplest way to protect your apps with a login screen.", | ||||||
| 	Long:  `Tinyauth is a simple authentication middleware that adds simple username/password login or OAuth with Google, Github and any generic OAuth provider to all of your docker apps.`, | 	Long:  `Tinyauth is a simple authentication middleware that adds simple username/password login or OAuth with Google, Github and any generic OAuth provider to all of your docker apps.`, | ||||||
| 	Run: func(cmd *cobra.Command, args []string) { | 	Run: func(cmd *cobra.Command, args []string) { | ||||||
| 		// Logger | 		var conf config.Config | ||||||
| 		log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}).With().Timestamp().Logger().Level(zerolog.FatalLevel) |  | ||||||
|  |  | ||||||
| 		// Get config | 		err := viper.Unmarshal(&conf) | ||||||
| 		var config types.Config | 		if err != nil { | ||||||
| 		err := viper.Unmarshal(&config) | 			log.Fatal().Err(err).Msg("Failed to parse config") | ||||||
| 		HandleError(err, "Failed to parse config") | 		} | ||||||
|  |  | ||||||
| 		// Secrets | 		// Check if secrets have a file associated with them | ||||||
| 		config.Secret = utils.GetSecret(config.Secret, config.SecretFile) | 		conf.Secret = utils.GetSecret(conf.Secret, conf.SecretFile) | ||||||
| 		config.GithubClientSecret = utils.GetSecret(config.GithubClientSecret, config.GithubClientSecretFile) | 		conf.GithubClientSecret = utils.GetSecret(conf.GithubClientSecret, conf.GithubClientSecretFile) | ||||||
| 		config.GoogleClientSecret = utils.GetSecret(config.GoogleClientSecret, config.GoogleClientSecretFile) | 		conf.GoogleClientSecret = utils.GetSecret(conf.GoogleClientSecret, conf.GoogleClientSecretFile) | ||||||
| 		config.GenericClientSecret = utils.GetSecret(config.GenericClientSecret, config.GenericClientSecretFile) | 		conf.GenericClientSecret = utils.GetSecret(conf.GenericClientSecret, conf.GenericClientSecretFile) | ||||||
|  |  | ||||||
| 		// Validate config | 		// Validate config | ||||||
| 		validator := validator.New() | 		v := validator.New() | ||||||
| 		err = validator.Struct(config) |  | ||||||
| 		HandleError(err, "Failed to validate config") |  | ||||||
|  |  | ||||||
| 		// Logger | 		err = v.Struct(conf) | ||||||
| 		log.Logger = log.Level(zerolog.Level(config.LogLevel)) | 		if err != nil { | ||||||
| 		log.Info().Str("version", strings.TrimSpace(constants.Version)).Msg("Starting tinyauth") | 			log.Fatal().Err(err).Msg("Invalid config") | ||||||
|  |  | ||||||
| 		// Users |  | ||||||
| 		log.Info().Msg("Parsing users") |  | ||||||
| 		users, err := utils.GetUsers(config.Users, config.UsersFile) |  | ||||||
| 		HandleError(err, "Failed to parse users") |  | ||||||
|  |  | ||||||
| 		if len(users) == 0 && !utils.OAuthConfigured(config) { |  | ||||||
| 			HandleError(errors.New("no users or OAuth configured"), "No users or OAuth configured") |  | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Get domain | 		log.Logger = log.Level(zerolog.Level(utils.GetLogLevel(conf.LogLevel))) | ||||||
| 		log.Debug().Msg("Getting domain") | 		log.Info().Str("version", strings.TrimSpace(config.Version)).Msg("Starting tinyauth") | ||||||
| 		domain, err := utils.GetUpperDomain(config.AppURL) |  | ||||||
| 		HandleError(err, "Failed to get upper domain") |  | ||||||
| 		log.Info().Str("domain", domain).Msg("Using domain for cookie store") |  | ||||||
|  |  | ||||||
| 		// Generate cookie name | 		// Create bootstrap app | ||||||
| 		cookieId := utils.GenerateIdentifier(strings.Split(domain, ".")[0]) | 		app := bootstrap.NewBootstrapApp(conf) | ||||||
| 		sessionCookieName := fmt.Sprintf("%s-%s", constants.SessionCookieName, cookieId) |  | ||||||
| 		csrfCookieName := fmt.Sprintf("%s-%s", constants.CsrfCookieName, cookieId) |  | ||||||
| 		redirectCookieName := fmt.Sprintf("%s-%s", constants.RedirectCookieName, cookieId) |  | ||||||
|  |  | ||||||
| 		// Generate HMAC and encryption secrets | 		// Run | ||||||
| 		log.Debug().Msg("Deriving HMAC and encryption secrets") | 		err = app.Setup() | ||||||
|  |  | ||||||
| 		hmacSecret, err := utils.DeriveKey(config.Secret, "hmac") | 		if err != nil { | ||||||
| 		HandleError(err, "Failed to derive HMAC secret") | 			log.Fatal().Err(err).Msg("Failed to setup app") | ||||||
|  |  | ||||||
| 		encryptionSecret, err := utils.DeriveKey(config.Secret, "encryption") |  | ||||||
| 		HandleError(err, "Failed to derive encryption secret") |  | ||||||
|  |  | ||||||
| 		// Create OAuth config |  | ||||||
| 		oauthConfig := types.OAuthConfig{ |  | ||||||
| 			GithubClientId:      config.GithubClientId, |  | ||||||
| 			GithubClientSecret:  config.GithubClientSecret, |  | ||||||
| 			GoogleClientId:      config.GoogleClientId, |  | ||||||
| 			GoogleClientSecret:  config.GoogleClientSecret, |  | ||||||
| 			GenericClientId:     config.GenericClientId, |  | ||||||
| 			GenericClientSecret: config.GenericClientSecret, |  | ||||||
| 			GenericScopes:       strings.Split(config.GenericScopes, ","), |  | ||||||
| 			GenericAuthURL:      config.GenericAuthURL, |  | ||||||
| 			GenericTokenURL:     config.GenericTokenURL, |  | ||||||
| 			GenericUserURL:      config.GenericUserURL, |  | ||||||
| 			GenericSkipSSL:      config.GenericSkipSSL, |  | ||||||
| 			AppURL:              config.AppURL, |  | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Create handlers config |  | ||||||
| 		handlersConfig := types.HandlersConfig{ |  | ||||||
| 			AppURL:                config.AppURL, |  | ||||||
| 			DisableContinue:       config.DisableContinue, |  | ||||||
| 			Title:                 config.Title, |  | ||||||
| 			GenericName:           config.GenericName, |  | ||||||
| 			CookieSecure:          config.CookieSecure, |  | ||||||
| 			Domain:                domain, |  | ||||||
| 			ForgotPasswordMessage: config.FogotPasswordMessage, |  | ||||||
| 			BackgroundImage:       config.BackgroundImage, |  | ||||||
| 			OAuthAutoRedirect:     config.OAuthAutoRedirect, |  | ||||||
| 			CsrfCookieName:        csrfCookieName, |  | ||||||
| 			RedirectCookieName:    redirectCookieName, |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Create server config |  | ||||||
| 		serverConfig := types.ServerConfig{ |  | ||||||
| 			Port:    config.Port, |  | ||||||
| 			Address: config.Address, |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Create auth config |  | ||||||
| 		authConfig := types.AuthConfig{ |  | ||||||
| 			Users:             users, |  | ||||||
| 			OauthWhitelist:    config.OAuthWhitelist, |  | ||||||
| 			CookieSecure:      config.CookieSecure, |  | ||||||
| 			SessionExpiry:     config.SessionExpiry, |  | ||||||
| 			Domain:            domain, |  | ||||||
| 			LoginTimeout:      config.LoginTimeout, |  | ||||||
| 			LoginMaxRetries:   config.LoginMaxRetries, |  | ||||||
| 			SessionCookieName: sessionCookieName, |  | ||||||
| 			HMACSecret:        hmacSecret, |  | ||||||
| 			EncryptionSecret:  encryptionSecret, |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Create hooks config |  | ||||||
| 		hooksConfig := types.HooksConfig{ |  | ||||||
| 			Domain: domain, |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Create docker service |  | ||||||
| 		docker, err := docker.NewDocker() |  | ||||||
| 		HandleError(err, "Failed to initialize docker") |  | ||||||
|  |  | ||||||
| 		// Create auth service |  | ||||||
| 		auth := auth.NewAuth(authConfig, docker) |  | ||||||
|  |  | ||||||
| 		// Create OAuth providers service |  | ||||||
| 		providers := providers.NewProviders(oauthConfig) |  | ||||||
|  |  | ||||||
| 		// Create hooks service |  | ||||||
| 		hooks := hooks.NewHooks(hooksConfig, auth, providers) |  | ||||||
|  |  | ||||||
| 		// Create handlers |  | ||||||
| 		handlers := handlers.NewHandlers(handlersConfig, auth, hooks, providers, docker) |  | ||||||
|  |  | ||||||
| 		// Create server |  | ||||||
| 		srv, err := server.NewServer(serverConfig, handlers) |  | ||||||
| 		HandleError(err, "Failed to create server") |  | ||||||
|  |  | ||||||
| 		// Start server |  | ||||||
| 		err = srv.Start() |  | ||||||
| 		HandleError(err, "Failed to start server") |  | ||||||
| 	}, | 	}, | ||||||
| } | } | ||||||
|  |  | ||||||
| func Execute() { | func Execute() { | ||||||
| 	err := rootCmd.Execute() | 	err := rootCmd.Execute() | ||||||
| 	HandleError(err, "Failed to execute root command") |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func HandleError(err error, msg string) { |  | ||||||
| 	// If error, log it and exit |  | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Fatal().Err(err).Msg(msg) | 		log.Fatal().Err(err).Msg("Failed to execute command") | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| func init() { | func init() { | ||||||
| 	// Add user command |  | ||||||
| 	rootCmd.AddCommand(userCmd.UserCmd()) | 	rootCmd.AddCommand(userCmd.UserCmd()) | ||||||
|  |  | ||||||
| 	// Add totp command |  | ||||||
| 	rootCmd.AddCommand(totpCmd.TotpCmd()) | 	rootCmd.AddCommand(totpCmd.TotpCmd()) | ||||||
|  |  | ||||||
| 	// Read environment variables |  | ||||||
| 	viper.AutomaticEnv() | 	viper.AutomaticEnv() | ||||||
|  |  | ||||||
| 	// Flags | 	configOptions := []struct { | ||||||
| 	rootCmd.Flags().Int("port", 3000, "Port to run the server on.") | 		name        string | ||||||
| 	rootCmd.Flags().String("address", "0.0.0.0", "Address to bind the server to.") | 		defaultVal  any | ||||||
| 	rootCmd.Flags().String("secret", "", "Secret to use for the cookie.") | 		description string | ||||||
| 	rootCmd.Flags().String("secret-file", "", "Path to a file containing the secret.") | 	}{ | ||||||
| 	rootCmd.Flags().String("app-url", "", "The tinyauth URL.") | 		{"port", 3000, "Port to run the server on."}, | ||||||
| 	rootCmd.Flags().String("users", "", "Comma separated list of users in the format username:hash.") | 		{"address", "0.0.0.0", "Address to bind the server to."}, | ||||||
| 	rootCmd.Flags().String("users-file", "", "Path to a file containing users in the format username:hash.") | 		{"secret", "", "Secret to use for the cookie."}, | ||||||
| 	rootCmd.Flags().Bool("cookie-secure", false, "Send cookie over secure connection only.") | 		{"secret-file", "", "Path to a file containing the secret."}, | ||||||
| 	rootCmd.Flags().String("github-client-id", "", "Github OAuth client ID.") | 		{"app-url", "", "The Tinyauth URL."}, | ||||||
| 	rootCmd.Flags().String("github-client-secret", "", "Github OAuth client secret.") | 		{"users", "", "Comma separated list of users in the format username:hash."}, | ||||||
| 	rootCmd.Flags().String("github-client-secret-file", "", "Github OAuth client secret file.") | 		{"users-file", "", "Path to a file containing users in the format username:hash."}, | ||||||
| 	rootCmd.Flags().String("google-client-id", "", "Google OAuth client ID.") | 		{"secure-cookie", false, "Send cookie over secure connection only."}, | ||||||
| 	rootCmd.Flags().String("google-client-secret", "", "Google OAuth client secret.") | 		{"github-client-id", "", "Github OAuth client ID."}, | ||||||
| 	rootCmd.Flags().String("google-client-secret-file", "", "Google OAuth client secret file.") | 		{"github-client-secret", "", "Github OAuth client secret."}, | ||||||
| 	rootCmd.Flags().String("generic-client-id", "", "Generic OAuth client ID.") | 		{"github-client-secret-file", "", "Github OAuth client secret file."}, | ||||||
| 	rootCmd.Flags().String("generic-client-secret", "", "Generic OAuth client secret.") | 		{"google-client-id", "", "Google OAuth client ID."}, | ||||||
| 	rootCmd.Flags().String("generic-client-secret-file", "", "Generic OAuth client secret file.") | 		{"google-client-secret", "", "Google OAuth client secret."}, | ||||||
| 	rootCmd.Flags().String("generic-scopes", "", "Generic OAuth scopes.") | 		{"google-client-secret-file", "", "Google OAuth client secret file."}, | ||||||
| 	rootCmd.Flags().String("generic-auth-url", "", "Generic OAuth auth URL.") | 		{"generic-client-id", "", "Generic OAuth client ID."}, | ||||||
| 	rootCmd.Flags().String("generic-token-url", "", "Generic OAuth token URL.") | 		{"generic-client-secret", "", "Generic OAuth client secret."}, | ||||||
| 	rootCmd.Flags().String("generic-user-url", "", "Generic OAuth user info URL.") | 		{"generic-client-secret-file", "", "Generic OAuth client secret file."}, | ||||||
| 	rootCmd.Flags().String("generic-name", "Generic", "Generic OAuth provider name.") | 		{"generic-scopes", "", "Generic OAuth scopes."}, | ||||||
| 	rootCmd.Flags().Bool("generic-skip-ssl", false, "Skip SSL verification for the generic OAuth provider.") | 		{"generic-auth-url", "", "Generic OAuth auth URL."}, | ||||||
| 	rootCmd.Flags().Bool("disable-continue", false, "Disable continue screen and redirect to app directly.") | 		{"generic-token-url", "", "Generic OAuth token URL."}, | ||||||
| 	rootCmd.Flags().String("oauth-whitelist", "", "Comma separated list of email addresses to whitelist when using OAuth.") | 		{"generic-user-url", "", "Generic OAuth user info URL."}, | ||||||
| 	rootCmd.Flags().String("oauth-auto-redirect", "none", "Auto redirect to the specified OAuth provider if configured. (available providers: github, google, generic)") | 		{"generic-name", "Generic", "Generic OAuth provider name."}, | ||||||
| 	rootCmd.Flags().Int("session-expiry", 86400, "Session (cookie) expiration time in seconds.") | 		{"generic-skip-ssl", false, "Skip SSL verification for the generic OAuth provider."}, | ||||||
| 	rootCmd.Flags().Int("login-timeout", 300, "Login timeout in seconds after max retries reached (0 to disable).") | 		{"disable-continue", false, "Disable continue screen and redirect to app directly."}, | ||||||
| 	rootCmd.Flags().Int("login-max-retries", 5, "Maximum login attempts before timeout (0 to disable).") | 		{"oauth-whitelist", "", "Comma separated list of email addresses to whitelist when using OAuth."}, | ||||||
| 	rootCmd.Flags().Int("log-level", 1, "Log level.") | 		{"oauth-auto-redirect", "none", "Auto redirect to the specified OAuth provider if configured. (available providers: github, google, generic)"}, | ||||||
| 	rootCmd.Flags().String("app-title", "Tinyauth", "Title of the app.") | 		{"session-expiry", 86400, "Session (cookie) expiration time in seconds."}, | ||||||
| 	rootCmd.Flags().String("forgot-password-message", "You can reset your password by changing the `USERS` environment variable.", "Message to show on the forgot password page.") | 		{"login-timeout", 300, "Login timeout in seconds after max retries reached (0 to disable)."}, | ||||||
| 	rootCmd.Flags().String("background-image", "/background.jpg", "Background image URL for the login page.") | 		{"login-max-retries", 5, "Maximum login attempts before timeout (0 to disable)."}, | ||||||
|  | 		{"log-level", "info", "Log level."}, | ||||||
|  | 		{"app-title", "Tinyauth", "Title of the app."}, | ||||||
|  | 		{"forgot-password-message", "", "Message to show on the forgot password page."}, | ||||||
|  | 		{"background-image", "/background.jpg", "Background image URL for the login page."}, | ||||||
|  | 		{"ldap-address", "", "LDAP server address (e.g. ldap://localhost:389)."}, | ||||||
|  | 		{"ldap-bind-dn", "", "LDAP bind DN (e.g. uid=user,dc=example,dc=com)."}, | ||||||
|  | 		{"ldap-bind-password", "", "LDAP bind password."}, | ||||||
|  | 		{"ldap-base-dn", "", "LDAP base DN (e.g. dc=example,dc=com)."}, | ||||||
|  | 		{"ldap-insecure", false, "Skip certificate verification for the LDAP server."}, | ||||||
|  | 		{"ldap-search-filter", "(uid=%s)", "LDAP search filter for user lookup."}, | ||||||
|  | 		{"resources-dir", "/data/resources", "Path to a directory containing custom resources (e.g. background image)."}, | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	// Bind flags to environment | 	for _, opt := range configOptions { | ||||||
| 	viper.BindEnv("port", "PORT") | 		switch v := opt.defaultVal.(type) { | ||||||
| 	viper.BindEnv("address", "ADDRESS") | 		case bool: | ||||||
| 	viper.BindEnv("secret", "SECRET") | 			rootCmd.Flags().Bool(opt.name, v, opt.description) | ||||||
| 	viper.BindEnv("secret-file", "SECRET_FILE") | 		case int: | ||||||
| 	viper.BindEnv("app-url", "APP_URL") | 			rootCmd.Flags().Int(opt.name, v, opt.description) | ||||||
| 	viper.BindEnv("users", "USERS") | 		case string: | ||||||
| 	viper.BindEnv("users-file", "USERS_FILE") | 			rootCmd.Flags().String(opt.name, v, opt.description) | ||||||
| 	viper.BindEnv("cookie-secure", "COOKIE_SECURE") | 		} | ||||||
| 	viper.BindEnv("github-client-id", "GITHUB_CLIENT_ID") |  | ||||||
| 	viper.BindEnv("github-client-secret", "GITHUB_CLIENT_SECRET") | 		// Create uppercase env var name | ||||||
| 	viper.BindEnv("github-client-secret-file", "GITHUB_CLIENT_SECRET_FILE") | 		envVar := strings.ReplaceAll(strings.ToUpper(opt.name), "-", "_") | ||||||
| 	viper.BindEnv("google-client-id", "GOOGLE_CLIENT_ID") | 		viper.BindEnv(opt.name, envVar) | ||||||
| 	viper.BindEnv("google-client-secret", "GOOGLE_CLIENT_SECRET") | 	} | ||||||
| 	viper.BindEnv("google-client-secret-file", "GOOGLE_CLIENT_SECRET_FILE") |  | ||||||
| 	viper.BindEnv("generic-client-id", "GENERIC_CLIENT_ID") |  | ||||||
| 	viper.BindEnv("generic-client-secret", "GENERIC_CLIENT_SECRET") |  | ||||||
| 	viper.BindEnv("generic-client-secret-file", "GENERIC_CLIENT_SECRET_FILE") |  | ||||||
| 	viper.BindEnv("generic-scopes", "GENERIC_SCOPES") |  | ||||||
| 	viper.BindEnv("generic-auth-url", "GENERIC_AUTH_URL") |  | ||||||
| 	viper.BindEnv("generic-token-url", "GENERIC_TOKEN_URL") |  | ||||||
| 	viper.BindEnv("generic-user-url", "GENERIC_USER_URL") |  | ||||||
| 	viper.BindEnv("generic-name", "GENERIC_NAME") |  | ||||||
| 	viper.BindEnv("generic-skip-ssl", "GENERIC_SKIP_SSL") |  | ||||||
| 	viper.BindEnv("disable-continue", "DISABLE_CONTINUE") |  | ||||||
| 	viper.BindEnv("oauth-whitelist", "OAUTH_WHITELIST") |  | ||||||
| 	viper.BindEnv("oauth-auto-redirect", "OAUTH_AUTO_REDIRECT") |  | ||||||
| 	viper.BindEnv("session-expiry", "SESSION_EXPIRY") |  | ||||||
| 	viper.BindEnv("log-level", "LOG_LEVEL") |  | ||||||
| 	viper.BindEnv("app-title", "APP_TITLE") |  | ||||||
| 	viper.BindEnv("login-timeout", "LOGIN_TIMEOUT") |  | ||||||
| 	viper.BindEnv("login-max-retries", "LOGIN_MAX_RETRIES") |  | ||||||
| 	viper.BindEnv("forgot-password-message", "FORGOT_PASSWORD_MESSAGE") |  | ||||||
| 	viper.BindEnv("background-image", "BACKGROUND_IMAGE") |  | ||||||
|  |  | ||||||
| 	// Bind flags to viper |  | ||||||
| 	viper.BindPFlags(rootCmd.Flags()) | 	viper.BindPFlags(rootCmd.Flags()) | ||||||
| } | } | ||||||
|   | |||||||
| @@ -15,7 +15,6 @@ import ( | |||||||
| 	"github.com/spf13/cobra" | 	"github.com/spf13/cobra" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // Interactive flag |  | ||||||
| var interactive bool | var interactive bool | ||||||
|  |  | ||||||
| // Input user | // Input user | ||||||
| @@ -25,15 +24,9 @@ var GenerateCmd = &cobra.Command{ | |||||||
| 	Use:   "generate", | 	Use:   "generate", | ||||||
| 	Short: "Generate a totp secret", | 	Short: "Generate a totp secret", | ||||||
| 	Run: func(cmd *cobra.Command, args []string) { | 	Run: func(cmd *cobra.Command, args []string) { | ||||||
| 		// Setup logger |  | ||||||
| 		log.Logger = log.Level(zerolog.InfoLevel) | 		log.Logger = log.Level(zerolog.InfoLevel) | ||||||
|  |  | ||||||
| 		// Use simple theme |  | ||||||
| 		var baseTheme *huh.Theme = huh.ThemeBase() |  | ||||||
|  |  | ||||||
| 		// Interactive |  | ||||||
| 		if interactive { | 		if interactive { | ||||||
| 			// Create huh form |  | ||||||
| 			form := huh.NewForm( | 			form := huh.NewForm( | ||||||
| 				huh.NewGroup( | 				huh.NewGroup( | ||||||
| 					huh.NewInput().Title("Current username:hash").Value(&iUser).Validate((func(s string) error { | 					huh.NewInput().Title("Current username:hash").Value(&iUser).Validate((func(s string) error { | ||||||
| @@ -44,51 +37,39 @@ var GenerateCmd = &cobra.Command{ | |||||||
| 					})), | 					})), | ||||||
| 				), | 				), | ||||||
| 			) | 			) | ||||||
|  | 			var baseTheme *huh.Theme = huh.ThemeBase() | ||||||
| 			// Run form |  | ||||||
| 			err := form.WithTheme(baseTheme).Run() | 			err := form.WithTheme(baseTheme).Run() | ||||||
|  |  | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 				log.Fatal().Err(err).Msg("Form failed") | 				log.Fatal().Err(err).Msg("Form failed") | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Parse user |  | ||||||
| 		user, err := utils.ParseUser(iUser) | 		user, err := utils.ParseUser(iUser) | ||||||
|  |  | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			log.Fatal().Err(err).Msg("Failed to parse user") | 			log.Fatal().Err(err).Msg("Failed to parse user") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Check if user was using docker escape |  | ||||||
| 		dockerEscape := false | 		dockerEscape := false | ||||||
|  |  | ||||||
| 		if strings.Contains(iUser, "$$") { | 		if strings.Contains(iUser, "$$") { | ||||||
| 			dockerEscape = true | 			dockerEscape = true | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Check it has totp |  | ||||||
| 		if user.TotpSecret != "" { | 		if user.TotpSecret != "" { | ||||||
| 			log.Fatal().Msg("User already has a totp secret") | 			log.Fatal().Msg("User already has a totp secret") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Generate totp secret |  | ||||||
| 		key, err := totp.Generate(totp.GenerateOpts{ | 		key, err := totp.Generate(totp.GenerateOpts{ | ||||||
| 			Issuer:      "Tinyauth", | 			Issuer:      "Tinyauth", | ||||||
| 			AccountName: user.Username, | 			AccountName: user.Username, | ||||||
| 		}) | 		}) | ||||||
|  |  | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			log.Fatal().Err(err).Msg("Failed to generate totp secret") | 			log.Fatal().Err(err).Msg("Failed to generate totp secret") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Create secret |  | ||||||
| 		secret := key.Secret() | 		secret := key.Secret() | ||||||
|  |  | ||||||
| 		// Print secret and image |  | ||||||
| 		log.Info().Str("secret", secret).Msg("Generated totp secret") | 		log.Info().Str("secret", secret).Msg("Generated totp secret") | ||||||
|  |  | ||||||
| 		// Print QR code |  | ||||||
| 		log.Info().Msg("Generated QR code") | 		log.Info().Msg("Generated QR code") | ||||||
|  |  | ||||||
| 		config := qrterminal.Config{ | 		config := qrterminal.Config{ | ||||||
| @@ -101,7 +82,6 @@ var GenerateCmd = &cobra.Command{ | |||||||
|  |  | ||||||
| 		qrterminal.GenerateWithConfig(key.URL(), config) | 		qrterminal.GenerateWithConfig(key.URL(), config) | ||||||
|  |  | ||||||
| 		// Add the secret to the user |  | ||||||
| 		user.TotpSecret = secret | 		user.TotpSecret = secret | ||||||
|  |  | ||||||
| 		// If using docker escape re-escape it | 		// If using docker escape re-escape it | ||||||
| @@ -109,13 +89,11 @@ var GenerateCmd = &cobra.Command{ | |||||||
| 			user.Password = strings.ReplaceAll(user.Password, "$", "$$") | 			user.Password = strings.ReplaceAll(user.Password, "$", "$$") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Print success |  | ||||||
| 		log.Info().Str("user", fmt.Sprintf("%s:%s:%s", user.Username, user.Password, user.TotpSecret)).Msg("Add the totp secret to your authenticator app then use the verify command to ensure everything is working correctly.") | 		log.Info().Str("user", fmt.Sprintf("%s:%s:%s", user.Username, user.Password, user.TotpSecret)).Msg("Add the totp secret to your authenticator app then use the verify command to ensure everything is working correctly.") | ||||||
| 	}, | 	}, | ||||||
| } | } | ||||||
|  |  | ||||||
| func init() { | func init() { | ||||||
| 	// Add interactive flag |  | ||||||
| 	GenerateCmd.Flags().BoolVarP(&interactive, "interactive", "i", false, "Run in interactive mode") | 	GenerateCmd.Flags().BoolVarP(&interactive, "interactive", "i", false, "Run in interactive mode") | ||||||
| 	GenerateCmd.Flags().StringVar(&iUser, "user", "", "Your current username:hash") | 	GenerateCmd.Flags().StringVar(&iUser, "user", "", "Your current username:hash") | ||||||
| } | } | ||||||
|   | |||||||
| @@ -7,16 +7,11 @@ import ( | |||||||
| ) | ) | ||||||
|  |  | ||||||
| func TotpCmd() *cobra.Command { | func TotpCmd() *cobra.Command { | ||||||
| 	// Create the totp command |  | ||||||
| 	totpCmd := &cobra.Command{ | 	totpCmd := &cobra.Command{ | ||||||
| 		Use:   "totp", | 		Use:   "totp", | ||||||
| 		Short: "Totp utilities", | 		Short: "Totp utilities", | ||||||
| 		Long:  `Utilities for creating and verifying totp codes.`, | 		Long:  `Utilities for creating and verifying totp codes.`, | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	// Add the generate command |  | ||||||
| 	totpCmd.AddCommand(generate.GenerateCmd) | 	totpCmd.AddCommand(generate.GenerateCmd) | ||||||
|  |  | ||||||
| 	// Return the totp command |  | ||||||
| 	return totpCmd | 	return totpCmd | ||||||
| } | } | ||||||
|   | |||||||
| @@ -12,10 +12,7 @@ import ( | |||||||
| 	"golang.org/x/crypto/bcrypt" | 	"golang.org/x/crypto/bcrypt" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // Interactive flag |  | ||||||
| var interactive bool | var interactive bool | ||||||
|  |  | ||||||
| // Docker flag |  | ||||||
| var docker bool | var docker bool | ||||||
|  |  | ||||||
| // i stands for input | // i stands for input | ||||||
| @@ -27,12 +24,9 @@ var CreateCmd = &cobra.Command{ | |||||||
| 	Short: "Create a user", | 	Short: "Create a user", | ||||||
| 	Long:  `Create a user either interactively or by passing flags.`, | 	Long:  `Create a user either interactively or by passing flags.`, | ||||||
| 	Run: func(cmd *cobra.Command, args []string) { | 	Run: func(cmd *cobra.Command, args []string) { | ||||||
| 		// Setup logger |  | ||||||
| 		log.Logger = log.Level(zerolog.InfoLevel) | 		log.Logger = log.Level(zerolog.InfoLevel) | ||||||
|  |  | ||||||
| 		// Check if interactive |  | ||||||
| 		if interactive { | 		if interactive { | ||||||
| 			// Create huh form |  | ||||||
| 			form := huh.NewForm( | 			form := huh.NewForm( | ||||||
| 				huh.NewGroup( | 				huh.NewGroup( | ||||||
| 					huh.NewInput().Title("Username").Value(&iUsername).Validate((func(s string) error { | 					huh.NewInput().Title("Username").Value(&iUsername).Validate((func(s string) error { | ||||||
| @@ -50,46 +44,35 @@ var CreateCmd = &cobra.Command{ | |||||||
| 					huh.NewSelect[bool]().Title("Format the output for docker?").Options(huh.NewOption("Yes", true), huh.NewOption("No", false)).Value(&docker), | 					huh.NewSelect[bool]().Title("Format the output for docker?").Options(huh.NewOption("Yes", true), huh.NewOption("No", false)).Value(&docker), | ||||||
| 				), | 				), | ||||||
| 			) | 			) | ||||||
|  |  | ||||||
| 			// Use simple theme |  | ||||||
| 			var baseTheme *huh.Theme = huh.ThemeBase() | 			var baseTheme *huh.Theme = huh.ThemeBase() | ||||||
|  |  | ||||||
| 			err := form.WithTheme(baseTheme).Run() | 			err := form.WithTheme(baseTheme).Run() | ||||||
|  |  | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 				log.Fatal().Err(err).Msg("Form failed") | 				log.Fatal().Err(err).Msg("Form failed") | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Do we have username and password? |  | ||||||
| 		if iUsername == "" || iPassword == "" { | 		if iUsername == "" || iPassword == "" { | ||||||
| 			log.Fatal().Err(errors.New("error invalid input")).Msg("Username and password cannot be empty") | 			log.Fatal().Err(errors.New("error invalid input")).Msg("Username and password cannot be empty") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		log.Info().Str("username", iUsername).Str("password", iPassword).Bool("docker", docker).Msg("Creating user") | 		log.Info().Str("username", iUsername).Str("password", iPassword).Bool("docker", docker).Msg("Creating user") | ||||||
|  |  | ||||||
| 		// Hash password |  | ||||||
| 		password, err := bcrypt.GenerateFromPassword([]byte(iPassword), bcrypt.DefaultCost) | 		password, err := bcrypt.GenerateFromPassword([]byte(iPassword), bcrypt.DefaultCost) | ||||||
|  |  | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			log.Fatal().Err(err).Msg("Failed to hash password") | 			log.Fatal().Err(err).Msg("Failed to hash password") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Convert password to string | 		// If docker format is enabled, escape the dollar sign | ||||||
| 		passwordString := string(password) | 		passwordString := string(password) | ||||||
|  |  | ||||||
| 		// Escape $ for docker |  | ||||||
| 		if docker { | 		if docker { | ||||||
| 			passwordString = strings.ReplaceAll(passwordString, "$", "$$") | 			passwordString = strings.ReplaceAll(passwordString, "$", "$$") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Log user created |  | ||||||
| 		log.Info().Str("user", fmt.Sprintf("%s:%s", iUsername, passwordString)).Msg("User created") | 		log.Info().Str("user", fmt.Sprintf("%s:%s", iUsername, passwordString)).Msg("User created") | ||||||
| 	}, | 	}, | ||||||
| } | } | ||||||
|  |  | ||||||
| func init() { | func init() { | ||||||
| 	// Flags |  | ||||||
| 	CreateCmd.Flags().BoolVarP(&interactive, "interactive", "i", false, "Create a user interactively") | 	CreateCmd.Flags().BoolVarP(&interactive, "interactive", "i", false, "Create a user interactively") | ||||||
| 	CreateCmd.Flags().BoolVar(&docker, "docker", false, "Format output for docker") | 	CreateCmd.Flags().BoolVar(&docker, "docker", false, "Format output for docker") | ||||||
| 	CreateCmd.Flags().StringVar(&iUsername, "username", "", "Username") | 	CreateCmd.Flags().StringVar(&iUsername, "username", "", "Username") | ||||||
|   | |||||||
| @@ -8,17 +8,12 @@ import ( | |||||||
| ) | ) | ||||||
|  |  | ||||||
| func UserCmd() *cobra.Command { | func UserCmd() *cobra.Command { | ||||||
| 	// Create the user command |  | ||||||
| 	userCmd := &cobra.Command{ | 	userCmd := &cobra.Command{ | ||||||
| 		Use:   "user", | 		Use:   "user", | ||||||
| 		Short: "User utilities", | 		Short: "User utilities", | ||||||
| 		Long:  `Utilities for creating and verifying tinyauth compatible users.`, | 		Long:  `Utilities for creating and verifying tinyauth compatible users.`, | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	// Add subcommands |  | ||||||
| 	userCmd.AddCommand(create.CreateCmd) | 	userCmd.AddCommand(create.CreateCmd) | ||||||
| 	userCmd.AddCommand(verify.VerifyCmd) | 	userCmd.AddCommand(verify.VerifyCmd) | ||||||
|  |  | ||||||
| 	// Return the user command |  | ||||||
| 	return userCmd | 	return userCmd | ||||||
| } | } | ||||||
|   | |||||||
| @@ -12,10 +12,7 @@ import ( | |||||||
| 	"golang.org/x/crypto/bcrypt" | 	"golang.org/x/crypto/bcrypt" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // Interactive flag |  | ||||||
| var interactive bool | var interactive bool | ||||||
|  |  | ||||||
| // Docker flag |  | ||||||
| var docker bool | var docker bool | ||||||
|  |  | ||||||
| // i stands for input | // i stands for input | ||||||
| @@ -29,15 +26,9 @@ var VerifyCmd = &cobra.Command{ | |||||||
| 	Short: "Verify a user is set up correctly", | 	Short: "Verify a user is set up correctly", | ||||||
| 	Long:  `Verify a user is set up correctly meaning that it has a correct username, password and totp code.`, | 	Long:  `Verify a user is set up correctly meaning that it has a correct username, password and totp code.`, | ||||||
| 	Run: func(cmd *cobra.Command, args []string) { | 	Run: func(cmd *cobra.Command, args []string) { | ||||||
| 		// Setup logger |  | ||||||
| 		log.Logger = log.Level(zerolog.InfoLevel) | 		log.Logger = log.Level(zerolog.InfoLevel) | ||||||
|  |  | ||||||
| 		// Use simple theme |  | ||||||
| 		var baseTheme *huh.Theme = huh.ThemeBase() |  | ||||||
|  |  | ||||||
| 		// Check if interactive |  | ||||||
| 		if interactive { | 		if interactive { | ||||||
| 			// Create huh form |  | ||||||
| 			form := huh.NewForm( | 			form := huh.NewForm( | ||||||
| 				huh.NewGroup( | 				huh.NewGroup( | ||||||
| 					huh.NewInput().Title("User (username:hash:totp)").Value(&iUser).Validate((func(s string) error { | 					huh.NewInput().Title("User (username:hash:totp)").Value(&iUser).Validate((func(s string) error { | ||||||
| @@ -61,35 +52,27 @@ var VerifyCmd = &cobra.Command{ | |||||||
| 					huh.NewInput().Title("Totp Code (if setup)").Value(&iTotp), | 					huh.NewInput().Title("Totp Code (if setup)").Value(&iTotp), | ||||||
| 				), | 				), | ||||||
| 			) | 			) | ||||||
|  | 			var baseTheme *huh.Theme = huh.ThemeBase() | ||||||
| 			// Run form |  | ||||||
| 			err := form.WithTheme(baseTheme).Run() | 			err := form.WithTheme(baseTheme).Run() | ||||||
|  |  | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 				log.Fatal().Err(err).Msg("Form failed") | 				log.Fatal().Err(err).Msg("Form failed") | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Parse user |  | ||||||
| 		user, err := utils.ParseUser(iUser) | 		user, err := utils.ParseUser(iUser) | ||||||
|  |  | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			log.Fatal().Err(err).Msg("Failed to parse user") | 			log.Fatal().Err(err).Msg("Failed to parse user") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Compare username |  | ||||||
| 		if user.Username != iUsername { | 		if user.Username != iUsername { | ||||||
| 			log.Fatal().Msg("Username is incorrect") | 			log.Fatal().Msg("Username is incorrect") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Compare password |  | ||||||
| 		err = bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(iPassword)) | 		err = bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(iPassword)) | ||||||
|  |  | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			log.Fatal().Msg("Ppassword is incorrect") | 			log.Fatal().Msg("Ppassword is incorrect") | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Check if user has 2fa code |  | ||||||
| 		if user.TotpSecret == "" { | 		if user.TotpSecret == "" { | ||||||
| 			if iTotp != "" { | 			if iTotp != "" { | ||||||
| 				log.Warn().Msg("User does not have 2fa secret") | 				log.Warn().Msg("User does not have 2fa secret") | ||||||
| @@ -98,21 +81,17 @@ var VerifyCmd = &cobra.Command{ | |||||||
| 			return | 			return | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Check totp code |  | ||||||
| 		ok := totp.Validate(iTotp, user.TotpSecret) | 		ok := totp.Validate(iTotp, user.TotpSecret) | ||||||
|  |  | ||||||
| 		if !ok { | 		if !ok { | ||||||
| 			log.Fatal().Msg("Totp code incorrect") | 			log.Fatal().Msg("Totp code incorrect") | ||||||
|  |  | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		// Done |  | ||||||
| 		log.Info().Msg("User verified") | 		log.Info().Msg("User verified") | ||||||
| 	}, | 	}, | ||||||
| } | } | ||||||
|  |  | ||||||
| func init() { | func init() { | ||||||
| 	// Flags |  | ||||||
| 	VerifyCmd.Flags().BoolVarP(&interactive, "interactive", "i", false, "Create a user interactively") | 	VerifyCmd.Flags().BoolVarP(&interactive, "interactive", "i", false, "Create a user interactively") | ||||||
| 	VerifyCmd.Flags().BoolVar(&docker, "docker", false, "Is the user formatted for docker?") | 	VerifyCmd.Flags().BoolVar(&docker, "docker", false, "Is the user formatted for docker?") | ||||||
| 	VerifyCmd.Flags().StringVar(&iUsername, "username", "", "Username") | 	VerifyCmd.Flags().StringVar(&iUsername, "username", "", "Username") | ||||||
|   | |||||||
| @@ -2,20 +2,19 @@ package cmd | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 	"tinyauth/internal/constants" | 	"tinyauth/internal/config" | ||||||
|  |  | ||||||
| 	"github.com/spf13/cobra" | 	"github.com/spf13/cobra" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // Create the version command |  | ||||||
| var versionCmd = &cobra.Command{ | var versionCmd = &cobra.Command{ | ||||||
| 	Use:   "version", | 	Use:   "version", | ||||||
| 	Short: "Print the version number of Tinyauth", | 	Short: "Print the version number of Tinyauth", | ||||||
| 	Long:  `All software has versions. This is Tinyauth's`, | 	Long:  `All software has versions. This is Tinyauth's`, | ||||||
| 	Run: func(cmd *cobra.Command, args []string) { | 	Run: func(cmd *cobra.Command, args []string) { | ||||||
| 		fmt.Printf("Version: %s\n", constants.Version) | 		fmt.Printf("Version: %s\n", config.Version) | ||||||
| 		fmt.Printf("Commit Hash: %s\n", constants.CommitHash) | 		fmt.Printf("Commit Hash: %s\n", config.CommitHash) | ||||||
| 		fmt.Printf("Build Timestamp: %s\n", constants.BuildTimestamp) | 		fmt.Printf("Build Timestamp: %s\n", config.BuildTimestamp) | ||||||
| 	}, | 	}, | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										8
									
								
								codecov.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								codecov.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | |||||||
|  | coverage: | ||||||
|  |   status: | ||||||
|  |     project: | ||||||
|  |       default: | ||||||
|  |         informational: true | ||||||
|  |     patch: | ||||||
|  |       default: | ||||||
|  |         informational: true | ||||||
| @@ -13,8 +13,8 @@ services: | |||||||
|     image: traefik/whoami:latest |     image: traefik/whoami:latest | ||||||
|     labels: |     labels: | ||||||
|       traefik.enable: true |       traefik.enable: true | ||||||
|       traefik.http.routers.nginx.rule: Host(`whoami.example.com`) |       traefik.http.routers.whoami.rule: Host(`whoami.example.com`) | ||||||
|       traefik.http.routers.nginx.middlewares: tinyauth |       traefik.http.routers.whoami.middlewares: tinyauth | ||||||
|  |  | ||||||
|   tinyauth-frontend: |   tinyauth-frontend: | ||||||
|     container_name: tinyauth-frontend |     container_name: tinyauth-frontend | ||||||
| @@ -42,6 +42,7 @@ services: | |||||||
|       - /var/run/docker.sock:/var/run/docker.sock |       - /var/run/docker.sock:/var/run/docker.sock | ||||||
|     ports: |     ports: | ||||||
|       - 3000:3000 |       - 3000:3000 | ||||||
|  |       - 4000:4000 | ||||||
|     labels: |     labels: | ||||||
|       traefik.enable: true |       traefik.enable: true | ||||||
|       traefik.http.middlewares.tinyauth.forwardauth.address: http://tinyauth-backend:3000/api/auth/traefik |       traefik.http.middlewares.tinyauth.forwardauth.address: http://tinyauth-backend:3000/api/auth/traefik | ||||||
|   | |||||||
| @@ -13,8 +13,8 @@ services: | |||||||
|     image: traefik/whoami:latest |     image: traefik/whoami:latest | ||||||
|     labels: |     labels: | ||||||
|       traefik.enable: true |       traefik.enable: true | ||||||
|       traefik.http.routers.nginx.rule: Host(`whoami.example.com`) |       traefik.http.routers.whoami.rule: Host(`whoami.example.com`) | ||||||
|       traefik.http.routers.nginx.middlewares: tinyauth |       traefik.http.routers.whoami.middlewares: tinyauth | ||||||
|  |  | ||||||
|   tinyauth: |   tinyauth: | ||||||
|     container_name: tinyauth |     container_name: tinyauth | ||||||
|   | |||||||
| @@ -4,50 +4,50 @@ | |||||||
|     "": { |     "": { | ||||||
|       "name": "tinyauth-shadcn", |       "name": "tinyauth-shadcn", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "@hookform/resolvers": "^5.1.1", |         "@hookform/resolvers": "^5.2.1", | ||||||
|         "@radix-ui/react-label": "^2.1.7", |         "@radix-ui/react-label": "^2.1.7", | ||||||
|         "@radix-ui/react-select": "^2.2.5", |         "@radix-ui/react-select": "^2.2.5", | ||||||
|         "@radix-ui/react-separator": "^1.1.7", |         "@radix-ui/react-separator": "^1.1.7", | ||||||
|         "@radix-ui/react-slot": "^1.2.3", |         "@radix-ui/react-slot": "^1.2.3", | ||||||
|         "@tailwindcss/vite": "^4.1.11", |         "@tailwindcss/vite": "^4.1.11", | ||||||
|         "@tanstack/react-query": "^5.81.5", |         "@tanstack/react-query": "^5.84.1", | ||||||
|         "axios": "^1.10.0", |         "axios": "^1.11.0", | ||||||
|         "class-variance-authority": "^0.7.1", |         "class-variance-authority": "^0.7.1", | ||||||
|         "clsx": "^2.1.1", |         "clsx": "^2.1.1", | ||||||
|         "dompurify": "^3.2.6", |         "dompurify": "^3.2.6", | ||||||
|         "i18next": "^25.3.0", |         "i18next": "^25.3.2", | ||||||
|         "i18next-browser-languagedetector": "^8.2.0", |         "i18next-browser-languagedetector": "^8.2.0", | ||||||
|         "i18next-resources-to-backend": "^1.2.1", |         "i18next-resources-to-backend": "^1.2.1", | ||||||
|         "input-otp": "^1.4.2", |         "input-otp": "^1.4.2", | ||||||
|         "lucide-react": "^0.525.0", |         "lucide-react": "^0.539.0", | ||||||
|         "next-themes": "^0.4.6", |         "next-themes": "^0.4.6", | ||||||
|         "react": "^19.0.0", |         "react": "^19.1.1", | ||||||
|         "react-dom": "^19.0.0", |         "react-dom": "^19.1.1", | ||||||
|         "react-hook-form": "^7.59.0", |         "react-hook-form": "^7.62.0", | ||||||
|         "react-i18next": "^15.5.3", |         "react-i18next": "^15.6.1", | ||||||
|         "react-markdown": "^10.1.0", |         "react-markdown": "^10.1.0", | ||||||
|         "react-router": "^7.6.3", |         "react-router": "^7.8.0", | ||||||
|         "sonner": "^2.0.5", |         "sonner": "^2.0.7", | ||||||
|         "tailwind-merge": "^3.3.1", |         "tailwind-merge": "^3.3.1", | ||||||
|         "tailwindcss": "^4.1.11", |         "tailwindcss": "^4.1.11", | ||||||
|         "zod": "^3.25.67", |         "zod": "^4.0.15", | ||||||
|       }, |       }, | ||||||
|       "devDependencies": { |       "devDependencies": { | ||||||
|         "@eslint/js": "^9.30.0", |         "@eslint/js": "^9.32.0", | ||||||
|         "@tanstack/eslint-plugin-query": "^5.81.2", |         "@tanstack/eslint-plugin-query": "^5.83.1", | ||||||
|         "@types/node": "^24.0.8", |         "@types/node": "^24.2.0", | ||||||
|         "@types/react": "^19.1.8", |         "@types/react": "^19.1.9", | ||||||
|         "@types/react-dom": "^19.1.6", |         "@types/react-dom": "^19.1.7", | ||||||
|         "@vitejs/plugin-react": "^4.6.0", |         "@vitejs/plugin-react": "^5.0.0", | ||||||
|         "eslint": "^9.30.0", |         "eslint": "^9.32.0", | ||||||
|         "eslint-plugin-react-hooks": "^5.2.0", |         "eslint-plugin-react-hooks": "^5.2.0", | ||||||
|         "eslint-plugin-react-refresh": "^0.4.19", |         "eslint-plugin-react-refresh": "^0.4.19", | ||||||
|         "globals": "^16.2.0", |         "globals": "^16.3.0", | ||||||
|         "prettier": "3.6.2", |         "prettier": "3.6.2", | ||||||
|         "tw-animate-css": "^1.3.4", |         "tw-animate-css": "^1.3.6", | ||||||
|         "typescript": "~5.8.3", |         "typescript": "~5.9.2", | ||||||
|         "typescript-eslint": "^8.35.1", |         "typescript-eslint": "^8.39.0", | ||||||
|         "vite": "^6.3.1", |         "vite": "^7.1.1", | ||||||
|       }, |       }, | ||||||
|     }, |     }, | ||||||
|   }, |   }, | ||||||
| @@ -58,12 +58,14 @@ | |||||||
|  |  | ||||||
|     "@babel/compat-data": ["@babel/compat-data@7.27.2", "", {}, "sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ=="], |     "@babel/compat-data": ["@babel/compat-data@7.27.2", "", {}, "sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ=="], | ||||||
|  |  | ||||||
|     "@babel/core": ["@babel/core@7.27.4", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.27.3", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.4", "@babel/parser": "^7.27.4", "@babel/template": "^7.27.2", "@babel/traverse": "^7.27.4", "@babel/types": "^7.27.3", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g=="], |     "@babel/core": ["@babel/core@7.28.0", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.6", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ=="], | ||||||
|  |  | ||||||
|     "@babel/generator": ["@babel/generator@7.27.5", "", { "dependencies": { "@babel/parser": "^7.27.5", "@babel/types": "^7.27.3", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" } }, "sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw=="], |     "@babel/generator": ["@babel/generator@7.28.0", "", { "dependencies": { "@babel/parser": "^7.28.0", "@babel/types": "^7.28.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg=="], | ||||||
|  |  | ||||||
|     "@babel/helper-compilation-targets": ["@babel/helper-compilation-targets@7.27.2", "", { "dependencies": { "@babel/compat-data": "^7.27.2", "@babel/helper-validator-option": "^7.27.1", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" } }, "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ=="], |     "@babel/helper-compilation-targets": ["@babel/helper-compilation-targets@7.27.2", "", { "dependencies": { "@babel/compat-data": "^7.27.2", "@babel/helper-validator-option": "^7.27.1", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" } }, "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ=="], | ||||||
|  |  | ||||||
|  |     "@babel/helper-globals": ["@babel/helper-globals@7.28.0", "", {}, "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw=="], | ||||||
|  |  | ||||||
|     "@babel/helper-module-imports": ["@babel/helper-module-imports@7.27.1", "", { "dependencies": { "@babel/traverse": "^7.27.1", "@babel/types": "^7.27.1" } }, "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w=="], |     "@babel/helper-module-imports": ["@babel/helper-module-imports@7.27.1", "", { "dependencies": { "@babel/traverse": "^7.27.1", "@babel/types": "^7.27.1" } }, "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w=="], | ||||||
|  |  | ||||||
|     "@babel/helper-module-transforms": ["@babel/helper-module-transforms@7.27.3", "", { "dependencies": { "@babel/helper-module-imports": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1", "@babel/traverse": "^7.27.3" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg=="], |     "@babel/helper-module-transforms": ["@babel/helper-module-transforms@7.27.3", "", { "dependencies": { "@babel/helper-module-imports": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1", "@babel/traverse": "^7.27.3" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg=="], | ||||||
| @@ -78,7 +80,7 @@ | |||||||
|  |  | ||||||
|     "@babel/helpers": ["@babel/helpers@7.27.6", "", { "dependencies": { "@babel/template": "^7.27.2", "@babel/types": "^7.27.6" } }, "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug=="], |     "@babel/helpers": ["@babel/helpers@7.27.6", "", { "dependencies": { "@babel/template": "^7.27.2", "@babel/types": "^7.27.6" } }, "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug=="], | ||||||
|  |  | ||||||
|     "@babel/parser": ["@babel/parser@7.27.5", "", { "dependencies": { "@babel/types": "^7.27.3" }, "bin": "./bin/babel-parser.js" }, "sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg=="], |     "@babel/parser": ["@babel/parser@7.28.0", "", { "dependencies": { "@babel/types": "^7.28.0" }, "bin": "./bin/babel-parser.js" }, "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g=="], | ||||||
|  |  | ||||||
|     "@babel/plugin-transform-react-jsx-self": ["@babel/plugin-transform-react-jsx-self@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw=="], |     "@babel/plugin-transform-react-jsx-self": ["@babel/plugin-transform-react-jsx-self@7.27.1", "", { "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw=="], | ||||||
|  |  | ||||||
| @@ -88,9 +90,9 @@ | |||||||
|  |  | ||||||
|     "@babel/template": ["@babel/template@7.27.2", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/parser": "^7.27.2", "@babel/types": "^7.27.1" } }, "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw=="], |     "@babel/template": ["@babel/template@7.27.2", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/parser": "^7.27.2", "@babel/types": "^7.27.1" } }, "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw=="], | ||||||
|  |  | ||||||
|     "@babel/traverse": ["@babel/traverse@7.27.4", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.27.3", "@babel/parser": "^7.27.4", "@babel/template": "^7.27.2", "@babel/types": "^7.27.3", "debug": "^4.3.1", "globals": "^11.1.0" } }, "sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA=="], |     "@babel/traverse": ["@babel/traverse@7.28.0", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-globals": "^7.28.0", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/types": "^7.28.0", "debug": "^4.3.1" } }, "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg=="], | ||||||
|  |  | ||||||
|     "@babel/types": ["@babel/types@7.27.6", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q=="], |     "@babel/types": ["@babel/types@7.28.1", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ=="], | ||||||
|  |  | ||||||
|     "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.4", "", { "os": "aix", "cpu": "ppc64" }, "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q=="], |     "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.4", "", { "os": "aix", "cpu": "ppc64" }, "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q=="], | ||||||
|  |  | ||||||
| @@ -150,15 +152,15 @@ | |||||||
|  |  | ||||||
|     "@eslint/config-helpers": ["@eslint/config-helpers@0.3.0", "", {}, "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw=="], |     "@eslint/config-helpers": ["@eslint/config-helpers@0.3.0", "", {}, "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw=="], | ||||||
|  |  | ||||||
|     "@eslint/core": ["@eslint/core@0.14.0", "", { "dependencies": { "@types/json-schema": "^7.0.15" } }, "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg=="], |     "@eslint/core": ["@eslint/core@0.15.1", "", { "dependencies": { "@types/json-schema": "^7.0.15" } }, "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA=="], | ||||||
|  |  | ||||||
|     "@eslint/eslintrc": ["@eslint/eslintrc@3.3.1", "", { "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^10.0.1", "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" } }, "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ=="], |     "@eslint/eslintrc": ["@eslint/eslintrc@3.3.1", "", { "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^10.0.1", "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" } }, "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ=="], | ||||||
|  |  | ||||||
|     "@eslint/js": ["@eslint/js@9.30.0", "", {}, "sha512-Wzw3wQwPvc9sHM+NjakWTcPx11mbZyiYHuwWa/QfZ7cIRX7WK54PSk7bdyXDaoaopUcMatv1zaQvOAAO8hCdww=="], |     "@eslint/js": ["@eslint/js@9.32.0", "", {}, "sha512-BBpRFZK3eX6uMLKz8WxFOBIFFcGFJ/g8XuwjTHCqHROSIsopI+ddn/d5Cfh36+7+e5edVS8dbSHnBNhrLEX0zg=="], | ||||||
|  |  | ||||||
|     "@eslint/object-schema": ["@eslint/object-schema@2.1.6", "", {}, "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA=="], |     "@eslint/object-schema": ["@eslint/object-schema@2.1.6", "", {}, "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA=="], | ||||||
|  |  | ||||||
|     "@eslint/plugin-kit": ["@eslint/plugin-kit@0.3.1", "", { "dependencies": { "@eslint/core": "^0.14.0", "levn": "^0.4.1" } }, "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w=="], |     "@eslint/plugin-kit": ["@eslint/plugin-kit@0.3.4", "", { "dependencies": { "@eslint/core": "^0.15.1", "levn": "^0.4.1" } }, "sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw=="], | ||||||
|  |  | ||||||
|     "@floating-ui/core": ["@floating-ui/core@1.7.0", "", { "dependencies": { "@floating-ui/utils": "^0.2.9" } }, "sha512-FRdBLykrPPA6P76GGGqlex/e7fbe0F1ykgxHYNXQsH/iTEtjMj/f9bpY5oQqbjt5VgZvgz/uKXbGuROijh3VLA=="], |     "@floating-ui/core": ["@floating-ui/core@1.7.0", "", { "dependencies": { "@floating-ui/utils": "^0.2.9" } }, "sha512-FRdBLykrPPA6P76GGGqlex/e7fbe0F1ykgxHYNXQsH/iTEtjMj/f9bpY5oQqbjt5VgZvgz/uKXbGuROijh3VLA=="], | ||||||
|  |  | ||||||
| @@ -168,7 +170,7 @@ | |||||||
|  |  | ||||||
|     "@floating-ui/utils": ["@floating-ui/utils@0.2.9", "", {}, "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg=="], |     "@floating-ui/utils": ["@floating-ui/utils@0.2.9", "", {}, "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg=="], | ||||||
|  |  | ||||||
|     "@hookform/resolvers": ["@hookform/resolvers@5.1.1", "", { "dependencies": { "@standard-schema/utils": "^0.3.0" }, "peerDependencies": { "react-hook-form": "^7.55.0" } }, "sha512-J/NVING3LMAEvexJkyTLjruSm7aOFx7QX21pzkiJfMoNG0wl5aFEjLTl7ay7IQb9EWY6AkrBy7tHL2Alijpdcg=="], |     "@hookform/resolvers": ["@hookform/resolvers@5.2.1", "", { "dependencies": { "@standard-schema/utils": "^0.3.0" }, "peerDependencies": { "react-hook-form": "^7.55.0" } }, "sha512-u0+6X58gkjMcxur1wRWokA7XsiiBJ6aK17aPZxhkoYiK5J+HcTx0Vhu9ovXe6H+dVpO6cjrn2FkJTryXEMlryQ=="], | ||||||
|  |  | ||||||
|     "@humanfs/core": ["@humanfs/core@0.19.1", "", {}, "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA=="], |     "@humanfs/core": ["@humanfs/core@0.19.1", "", {}, "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA=="], | ||||||
|  |  | ||||||
| @@ -252,47 +254,47 @@ | |||||||
|  |  | ||||||
|     "@radix-ui/rect": ["@radix-ui/rect@1.1.1", "", {}, "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw=="], |     "@radix-ui/rect": ["@radix-ui/rect@1.1.1", "", {}, "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw=="], | ||||||
|  |  | ||||||
|     "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.0-beta.19", "", {}, "sha512-3FL3mnMbPu0muGOCaKAhhFEYmqv9eTfPSJRJmANrCwtgK8VuxpsZDGK+m0LYAGoyO8+0j5uRe4PeyPDK1yA/hA=="], |     "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.0-beta.30", "", {}, "sha512-whXaSoNUFiyDAjkUF8OBpOm77Szdbk5lGNqFe6CbVbJFrhCCPinCbRA3NjawwlNHla1No7xvXXh+CpSxnPfUEw=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.40.2", "", { "os": "android", "cpu": "arm" }, "sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg=="], |     "@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.46.2", "", { "os": "android", "cpu": "arm" }, "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.40.2", "", { "os": "android", "cpu": "arm64" }, "sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw=="], |     "@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.46.2", "", { "os": "android", "cpu": "arm64" }, "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-darwin-arm64": ["@rollup/rollup-darwin-arm64@4.40.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w=="], |     "@rollup/rollup-darwin-arm64": ["@rollup/rollup-darwin-arm64@4.46.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-darwin-x64": ["@rollup/rollup-darwin-x64@4.40.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ=="], |     "@rollup/rollup-darwin-x64": ["@rollup/rollup-darwin-x64@4.46.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-freebsd-arm64": ["@rollup/rollup-freebsd-arm64@4.40.2", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ=="], |     "@rollup/rollup-freebsd-arm64": ["@rollup/rollup-freebsd-arm64@4.46.2", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-freebsd-x64": ["@rollup/rollup-freebsd-x64@4.40.2", "", { "os": "freebsd", "cpu": "x64" }, "sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q=="], |     "@rollup/rollup-freebsd-x64": ["@rollup/rollup-freebsd-x64@4.46.2", "", { "os": "freebsd", "cpu": "x64" }, "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-arm-gnueabihf": ["@rollup/rollup-linux-arm-gnueabihf@4.40.2", "", { "os": "linux", "cpu": "arm" }, "sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q=="], |     "@rollup/rollup-linux-arm-gnueabihf": ["@rollup/rollup-linux-arm-gnueabihf@4.46.2", "", { "os": "linux", "cpu": "arm" }, "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-arm-musleabihf": ["@rollup/rollup-linux-arm-musleabihf@4.40.2", "", { "os": "linux", "cpu": "arm" }, "sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg=="], |     "@rollup/rollup-linux-arm-musleabihf": ["@rollup/rollup-linux-arm-musleabihf@4.46.2", "", { "os": "linux", "cpu": "arm" }, "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-arm64-gnu": ["@rollup/rollup-linux-arm64-gnu@4.40.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg=="], |     "@rollup/rollup-linux-arm64-gnu": ["@rollup/rollup-linux-arm64-gnu@4.46.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-arm64-musl": ["@rollup/rollup-linux-arm64-musl@4.40.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg=="], |     "@rollup/rollup-linux-arm64-musl": ["@rollup/rollup-linux-arm64-musl@4.46.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-loongarch64-gnu": ["@rollup/rollup-linux-loongarch64-gnu@4.40.2", "", { "os": "linux", "cpu": "none" }, "sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw=="], |     "@rollup/rollup-linux-loongarch64-gnu": ["@rollup/rollup-linux-loongarch64-gnu@4.46.2", "", { "os": "linux", "cpu": "none" }, "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-powerpc64le-gnu": ["@rollup/rollup-linux-powerpc64le-gnu@4.40.2", "", { "os": "linux", "cpu": "ppc64" }, "sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q=="], |     "@rollup/rollup-linux-ppc64-gnu": ["@rollup/rollup-linux-ppc64-gnu@4.46.2", "", { "os": "linux", "cpu": "ppc64" }, "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-riscv64-gnu": ["@rollup/rollup-linux-riscv64-gnu@4.40.2", "", { "os": "linux", "cpu": "none" }, "sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg=="], |     "@rollup/rollup-linux-riscv64-gnu": ["@rollup/rollup-linux-riscv64-gnu@4.46.2", "", { "os": "linux", "cpu": "none" }, "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-riscv64-musl": ["@rollup/rollup-linux-riscv64-musl@4.40.2", "", { "os": "linux", "cpu": "none" }, "sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg=="], |     "@rollup/rollup-linux-riscv64-musl": ["@rollup/rollup-linux-riscv64-musl@4.46.2", "", { "os": "linux", "cpu": "none" }, "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-s390x-gnu": ["@rollup/rollup-linux-s390x-gnu@4.40.2", "", { "os": "linux", "cpu": "s390x" }, "sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ=="], |     "@rollup/rollup-linux-s390x-gnu": ["@rollup/rollup-linux-s390x-gnu@4.46.2", "", { "os": "linux", "cpu": "s390x" }, "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-x64-gnu": ["@rollup/rollup-linux-x64-gnu@4.40.2", "", { "os": "linux", "cpu": "x64" }, "sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng=="], |     "@rollup/rollup-linux-x64-gnu": ["@rollup/rollup-linux-x64-gnu@4.46.2", "", { "os": "linux", "cpu": "x64" }, "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-linux-x64-musl": ["@rollup/rollup-linux-x64-musl@4.40.2", "", { "os": "linux", "cpu": "x64" }, "sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA=="], |     "@rollup/rollup-linux-x64-musl": ["@rollup/rollup-linux-x64-musl@4.46.2", "", { "os": "linux", "cpu": "x64" }, "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-win32-arm64-msvc": ["@rollup/rollup-win32-arm64-msvc@4.40.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg=="], |     "@rollup/rollup-win32-arm64-msvc": ["@rollup/rollup-win32-arm64-msvc@4.46.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-win32-ia32-msvc": ["@rollup/rollup-win32-ia32-msvc@4.40.2", "", { "os": "win32", "cpu": "ia32" }, "sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA=="], |     "@rollup/rollup-win32-ia32-msvc": ["@rollup/rollup-win32-ia32-msvc@4.46.2", "", { "os": "win32", "cpu": "ia32" }, "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ=="], | ||||||
|  |  | ||||||
|     "@rollup/rollup-win32-x64-msvc": ["@rollup/rollup-win32-x64-msvc@4.40.2", "", { "os": "win32", "cpu": "x64" }, "sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA=="], |     "@rollup/rollup-win32-x64-msvc": ["@rollup/rollup-win32-x64-msvc@4.46.2", "", { "os": "win32", "cpu": "x64" }, "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg=="], | ||||||
|  |  | ||||||
|     "@standard-schema/utils": ["@standard-schema/utils@0.3.0", "", {}, "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g=="], |     "@standard-schema/utils": ["@standard-schema/utils@0.3.0", "", {}, "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g=="], | ||||||
|  |  | ||||||
| @@ -326,11 +328,11 @@ | |||||||
|  |  | ||||||
|     "@tailwindcss/vite": ["@tailwindcss/vite@4.1.11", "", { "dependencies": { "@tailwindcss/node": "4.1.11", "@tailwindcss/oxide": "4.1.11", "tailwindcss": "4.1.11" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7" } }, "sha512-RHYhrR3hku0MJFRV+fN2gNbDNEh3dwKvY8XJvTxCSXeMOsCRSr+uKvDWQcbizrHgjML6ZmTE5OwMrl5wKcujCw=="], |     "@tailwindcss/vite": ["@tailwindcss/vite@4.1.11", "", { "dependencies": { "@tailwindcss/node": "4.1.11", "@tailwindcss/oxide": "4.1.11", "tailwindcss": "4.1.11" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7" } }, "sha512-RHYhrR3hku0MJFRV+fN2gNbDNEh3dwKvY8XJvTxCSXeMOsCRSr+uKvDWQcbizrHgjML6ZmTE5OwMrl5wKcujCw=="], | ||||||
|  |  | ||||||
|     "@tanstack/eslint-plugin-query": ["@tanstack/eslint-plugin-query@5.81.2", "", { "dependencies": { "@typescript-eslint/utils": "^8.18.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0" } }, "sha512-h4k6P6fm5VhKP5NkK+0TTVpGGyKQdx6tk7NYYG7J7PkSu7ClpLgBihw7yzK8N3n5zPaF3IMyErxfoNiXWH/3/A=="], |     "@tanstack/eslint-plugin-query": ["@tanstack/eslint-plugin-query@5.83.1", "", { "dependencies": { "@typescript-eslint/utils": "^8.37.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0" } }, "sha512-tdkpPFfzkTksN9BIlT/qjixSAtKrsW6PUVRwdKWaOcag7DrD1vpki3UzzdfMQGDRGeg1Ue1Dg+rcl5FJGembNg=="], | ||||||
|  |  | ||||||
|     "@tanstack/query-core": ["@tanstack/query-core@5.81.5", "", {}, "sha512-ZJOgCy/z2qpZXWaj/oxvodDx07XcQa9BF92c0oINjHkoqUPsmm3uG08HpTaviviZ/N9eP1f9CM7mKSEkIo7O1Q=="], |     "@tanstack/query-core": ["@tanstack/query-core@5.83.1", "", {}, "sha512-OG69LQgT7jSp+5pPuCfzltq/+7l2xoweggjme9vlbCPa/d7D7zaqv5vN/S82SzSYZ4EDLTxNO1PWrv49RAS64Q=="], | ||||||
|  |  | ||||||
|     "@tanstack/react-query": ["@tanstack/react-query@5.81.5", "", { "dependencies": { "@tanstack/query-core": "5.81.5" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-lOf2KqRRiYWpQT86eeeftAGnjuTR35myTP8MXyvHa81VlomoAWNEd8x5vkcAfQefu0qtYCvyqLropFZqgI2EQw=="], |     "@tanstack/react-query": ["@tanstack/react-query@5.84.1", "", { "dependencies": { "@tanstack/query-core": "5.83.1" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-zo7EUygcWJMQfFNWDSG7CBhy8irje/XY0RDVKKV4IQJAysb+ZJkkJPcnQi+KboyGUgT+SQebRFoTqLuTtfoDLw=="], | ||||||
|  |  | ||||||
|     "@types/babel__core": ["@types/babel__core@7.20.5", "", { "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" } }, "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA=="], |     "@types/babel__core": ["@types/babel__core@7.20.5", "", { "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" } }, "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA=="], | ||||||
|  |  | ||||||
| @@ -354,39 +356,39 @@ | |||||||
|  |  | ||||||
|     "@types/ms": ["@types/ms@2.1.0", "", {}, "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA=="], |     "@types/ms": ["@types/ms@2.1.0", "", {}, "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA=="], | ||||||
|  |  | ||||||
|     "@types/node": ["@types/node@24.0.8", "", { "dependencies": { "undici-types": "~7.8.0" } }, "sha512-WytNrFSgWO/esSH9NbpWUfTMGQwCGIKfCmNlmFDNiI5gGhgMmEA+V1AEvKLeBNvvtBnailJtkrEa2OIISwrVAA=="], |     "@types/node": ["@types/node@24.2.0", "", { "dependencies": { "undici-types": "~7.10.0" } }, "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw=="], | ||||||
|  |  | ||||||
|     "@types/react": ["@types/react@19.1.8", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g=="], |     "@types/react": ["@types/react@19.1.9", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-WmdoynAX8Stew/36uTSVMcLJJ1KRh6L3IZRx1PZ7qJtBqT3dYTgyDTx8H1qoRghErydW7xw9mSJ3wS//tCRpFA=="], | ||||||
|  |  | ||||||
|     "@types/react-dom": ["@types/react-dom@19.1.6", "", { "peerDependencies": { "@types/react": "^19.0.0" } }, "sha512-4hOiT/dwO8Ko0gV1m/TJZYk3y0KBnY9vzDh7W+DH17b2HFSOGgdj33dhihPeuy3l0q23+4e+hoXHV6hCC4dCXw=="], |     "@types/react-dom": ["@types/react-dom@19.1.7", "", { "peerDependencies": { "@types/react": "^19.0.0" } }, "sha512-i5ZzwYpqjmrKenzkoLM2Ibzt6mAsM7pxB6BCIouEVVmgiqaMj1TjaK7hnA36hbW5aZv20kx7Lw6hWzPWg0Rurw=="], | ||||||
|  |  | ||||||
|     "@types/trusted-types": ["@types/trusted-types@2.0.7", "", {}, "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="], |     "@types/trusted-types": ["@types/trusted-types@2.0.7", "", {}, "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="], | ||||||
|  |  | ||||||
|     "@types/unist": ["@types/unist@3.0.3", "", {}, "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q=="], |     "@types/unist": ["@types/unist@3.0.3", "", {}, "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.35.1", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.35.1", "@typescript-eslint/type-utils": "8.35.1", "@typescript-eslint/utils": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.35.1", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg=="], |     "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.39.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.39.0", "@typescript-eslint/type-utils": "8.39.0", "@typescript-eslint/utils": "8.39.0", "@typescript-eslint/visitor-keys": "8.39.0", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.39.0", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-bhEz6OZeUR+O/6yx9Jk6ohX6H9JSFTaiY0v9/PuKT3oGK0rn0jNplLmyFUGV+a9gfYnVNwGDwS/UkLIuXNb2Rw=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/parser": ["@typescript-eslint/parser@8.35.1", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.35.1", "@typescript-eslint/types": "8.35.1", "@typescript-eslint/typescript-estree": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w=="], |     "@typescript-eslint/parser": ["@typescript-eslint/parser@8.39.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.39.0", "@typescript-eslint/types": "8.39.0", "@typescript-eslint/typescript-estree": "8.39.0", "@typescript-eslint/visitor-keys": "8.39.0", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-g3WpVQHngx0aLXn6kfIYCZxM6rRJlWzEkVpqEFLT3SgEDsp9cpCbxxgwnE504q4H+ruSDh/VGS6nqZIDynP+vg=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.34.1", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.34.1", "@typescript-eslint/types": "^8.34.1", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-nuHlOmFZfuRwLJKDGQOVc0xnQrAmuq1Mj/ISou5044y1ajGNp2BNliIqp7F2LPQ5sForz8lempMFCovfeS1XoA=="], |     "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.39.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.39.0", "@typescript-eslint/types": "^8.39.0", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-CTzJqaSq30V/Z2Og9jogzZt8lJRR5TKlAdXmWgdu4hgcC9Kww5flQ+xFvMxIBWVNdxJO7OifgdOK4PokMIWPew=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.34.1", "", { "dependencies": { "@typescript-eslint/types": "8.34.1", "@typescript-eslint/visitor-keys": "8.34.1" } }, "sha512-beu6o6QY4hJAgL1E8RaXNC071G4Kso2MGmJskCFQhRhg8VOH/FDbC8soP8NHN7e/Hdphwp8G8cE6OBzC8o41ZA=="], |     "@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.38.0", "", { "dependencies": { "@typescript-eslint/types": "8.38.0", "@typescript-eslint/visitor-keys": "8.38.0" } }, "sha512-WJw3AVlFFcdT9Ri1xs/lg8LwDqgekWXWhH3iAF+1ZM+QPd7oxQ6jvtW/JPwzAScxitILUIFs0/AnQ/UWHzbATQ=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.34.1", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-K4Sjdo4/xF9NEeA2khOb7Y5nY6NSXBnod87uniVYW9kHP+hNlDV8trUSFeynA2uxWam4gIWgWoygPrv9VMWrYg=="], |     "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.39.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-Fd3/QjmFV2sKmvv3Mrj8r6N8CryYiCS8Wdb/6/rgOXAWGcFuc+VkQuG28uk/4kVNVZBQuuDHEDUpo/pQ32zsIQ=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.35.1", "", { "dependencies": { "@typescript-eslint/typescript-estree": "8.35.1", "@typescript-eslint/utils": "8.35.1", "debug": "^4.3.4", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ=="], |     "@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.39.0", "", { "dependencies": { "@typescript-eslint/types": "8.39.0", "@typescript-eslint/typescript-estree": "8.39.0", "@typescript-eslint/utils": "8.39.0", "debug": "^4.3.4", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-6B3z0c1DXVT2vYA9+z9axjtc09rqKUPRmijD5m9iv8iQpHBRYRMBcgxSiKTZKm6FwWw1/cI4v6em35OsKCiN5Q=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/types": ["@typescript-eslint/types@8.34.1", "", {}, "sha512-rjLVbmE7HR18kDsjNIZQHxmv9RZwlgzavryL5Lnj2ujIRTeXlKtILHgRNmQ3j4daw7zd+mQgy+uyt6Zo6I0IGA=="], |     "@typescript-eslint/types": ["@typescript-eslint/types@8.38.0", "", {}, "sha512-wzkUfX3plUqij4YwWaJyqhiPE5UCRVlFpKn1oCRn2O1bJ592XxWJj8ROQ3JD5MYXLORW84063z3tZTb/cs4Tyw=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.34.1", "", { "dependencies": { "@typescript-eslint/project-service": "8.34.1", "@typescript-eslint/tsconfig-utils": "8.34.1", "@typescript-eslint/types": "8.34.1", "@typescript-eslint/visitor-keys": "8.34.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-rjCNqqYPuMUF5ODD+hWBNmOitjBWghkGKJg6hiCHzUvXRy6rK22Jd3rwbP2Xi+R7oYVvIKhokHVhH41BxPV5mA=="], |     "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.39.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.39.0", "@typescript-eslint/tsconfig-utils": "8.39.0", "@typescript-eslint/types": "8.39.0", "@typescript-eslint/visitor-keys": "8.39.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-ndWdiflRMvfIgQRpckQQLiB5qAKQ7w++V4LlCHwp62eym1HLB/kw7D9f2e8ytONls/jt89TEasgvb+VwnRprsw=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/utils": ["@typescript-eslint/utils@8.34.1", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.34.1", "@typescript-eslint/types": "8.34.1", "@typescript-eslint/typescript-estree": "8.34.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-mqOwUdZ3KjtGk7xJJnLbHxTuWVn3GO2WZZuM+Slhkun4+qthLdXx32C8xIXbO1kfCECb3jIs3eoxK3eryk7aoQ=="], |     "@typescript-eslint/utils": ["@typescript-eslint/utils@8.38.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.38.0", "@typescript-eslint/types": "8.38.0", "@typescript-eslint/typescript-estree": "8.38.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-hHcMA86Hgt+ijJlrD8fX0j1j8w4C92zue/8LOPAFioIno+W0+L7KqE8QZKCcPGc/92Vs9x36w/4MPTJhqXdyvg=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.35.1", "", { "dependencies": { "@typescript-eslint/types": "8.35.1", "eslint-visitor-keys": "^4.2.1" } }, "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw=="], |     "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.39.0", "", { "dependencies": { "@typescript-eslint/types": "8.39.0", "eslint-visitor-keys": "^4.2.1" } }, "sha512-ldgiJ+VAhQCfIjeOgu8Kj5nSxds0ktPOSO9p4+0VDH2R2pLvQraaM5Oen2d7NxzMCm+Sn/vJT+mv2H5u6b/3fA=="], | ||||||
|  |  | ||||||
|     "@ungap/structured-clone": ["@ungap/structured-clone@1.3.0", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="], |     "@ungap/structured-clone": ["@ungap/structured-clone@1.3.0", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="], | ||||||
|  |  | ||||||
|     "@vitejs/plugin-react": ["@vitejs/plugin-react@4.6.0", "", { "dependencies": { "@babel/core": "^7.27.4", "@babel/plugin-transform-react-jsx-self": "^7.27.1", "@babel/plugin-transform-react-jsx-source": "^7.27.1", "@rolldown/pluginutils": "1.0.0-beta.19", "@types/babel__core": "^7.20.5", "react-refresh": "^0.17.0" }, "peerDependencies": { "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0" } }, "sha512-5Kgff+m8e2PB+9j51eGHEpn5kUzRKH2Ry0qGoe8ItJg7pqnkPrYPkDQZGgGmTa0EGarHrkjLvOdU3b1fzI8otQ=="], |     "@vitejs/plugin-react": ["@vitejs/plugin-react@5.0.0", "", { "dependencies": { "@babel/core": "^7.28.0", "@babel/plugin-transform-react-jsx-self": "^7.27.1", "@babel/plugin-transform-react-jsx-source": "^7.27.1", "@rolldown/pluginutils": "1.0.0-beta.30", "@types/babel__core": "^7.20.5", "react-refresh": "^0.17.0" }, "peerDependencies": { "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" } }, "sha512-Jx9JfsTa05bYkS9xo0hkofp2dCmp1blrKjw9JONs5BTHOvJCgLbaPSuZLGSVJW6u2qe0tc4eevY0+gSNNi0YCw=="], | ||||||
|  |  | ||||||
|     "acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="], |     "acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="], | ||||||
|  |  | ||||||
| @@ -402,7 +404,7 @@ | |||||||
|  |  | ||||||
|     "asynckit": ["asynckit@0.4.0", "", {}, "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="], |     "asynckit": ["asynckit@0.4.0", "", {}, "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="], | ||||||
|  |  | ||||||
|     "axios": ["axios@1.10.0", "", { "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } }, "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw=="], |     "axios": ["axios@1.11.0", "", { "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.4", "proxy-from-env": "^1.1.0" } }, "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA=="], | ||||||
|  |  | ||||||
|     "bail": ["bail@2.0.2", "", {}, "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw=="], |     "bail": ["bail@2.0.2", "", {}, "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw=="], | ||||||
|  |  | ||||||
| @@ -494,7 +496,7 @@ | |||||||
|  |  | ||||||
|     "escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="], |     "escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="], | ||||||
|  |  | ||||||
|     "eslint": ["eslint@9.30.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.21.0", "@eslint/config-helpers": "^0.3.0", "@eslint/core": "^0.14.0", "@eslint/eslintrc": "^3.3.1", "@eslint/js": "9.30.0", "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.4.0", "eslint-visitor-keys": "^4.2.1", "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-iN/SiPxmQu6EVkf+m1qpBxzUhE12YqFLOSySuOyVLJLEF9nzTf+h/1AJYc1JWzCnktggeNrjvQGLngDzXirU6g=="], |     "eslint": ["eslint@9.32.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.21.0", "@eslint/config-helpers": "^0.3.0", "@eslint/core": "^0.15.0", "@eslint/eslintrc": "^3.3.1", "@eslint/js": "9.32.0", "@eslint/plugin-kit": "^0.3.4", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.4.0", "eslint-visitor-keys": "^4.2.1", "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-LSehfdpgMeWcTZkWZVIJl+tkZ2nuSkyyB9C27MZqFWXuph7DvaowgcTvKqxvpLW1JZIk8PN7hFY3Rj9LQ7m7lg=="], | ||||||
|  |  | ||||||
|     "eslint-plugin-react-hooks": ["eslint-plugin-react-hooks@5.2.0", "", { "peerDependencies": { "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" } }, "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg=="], |     "eslint-plugin-react-hooks": ["eslint-plugin-react-hooks@5.2.0", "", { "peerDependencies": { "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" } }, "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg=="], | ||||||
|  |  | ||||||
| @@ -528,7 +530,7 @@ | |||||||
|  |  | ||||||
|     "fastq": ["fastq@1.19.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="], |     "fastq": ["fastq@1.19.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="], | ||||||
|  |  | ||||||
|     "fdir": ["fdir@6.4.4", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg=="], |     "fdir": ["fdir@6.4.6", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w=="], | ||||||
|  |  | ||||||
|     "file-entry-cache": ["file-entry-cache@8.0.0", "", { "dependencies": { "flat-cache": "^4.0.0" } }, "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ=="], |     "file-entry-cache": ["file-entry-cache@8.0.0", "", { "dependencies": { "flat-cache": "^4.0.0" } }, "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ=="], | ||||||
|  |  | ||||||
| @@ -542,7 +544,7 @@ | |||||||
|  |  | ||||||
|     "follow-redirects": ["follow-redirects@1.15.9", "", {}, "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="], |     "follow-redirects": ["follow-redirects@1.15.9", "", {}, "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="], | ||||||
|  |  | ||||||
|     "form-data": ["form-data@4.0.2", "", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", "mime-types": "^2.1.12" } }, "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w=="], |     "form-data": ["form-data@4.0.4", "", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", "hasown": "^2.0.2", "mime-types": "^2.1.12" } }, "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow=="], | ||||||
|  |  | ||||||
|     "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], |     "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], | ||||||
|  |  | ||||||
| @@ -558,7 +560,7 @@ | |||||||
|  |  | ||||||
|     "glob-parent": ["glob-parent@6.0.2", "", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="], |     "glob-parent": ["glob-parent@6.0.2", "", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="], | ||||||
|  |  | ||||||
|     "globals": ["globals@16.2.0", "", {}, "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg=="], |     "globals": ["globals@16.3.0", "", {}, "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ=="], | ||||||
|  |  | ||||||
|     "gopd": ["gopd@1.2.0", "", {}, "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="], |     "gopd": ["gopd@1.2.0", "", {}, "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="], | ||||||
|  |  | ||||||
| @@ -582,7 +584,7 @@ | |||||||
|  |  | ||||||
|     "html-url-attributes": ["html-url-attributes@3.0.1", "", {}, "sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ=="], |     "html-url-attributes": ["html-url-attributes@3.0.1", "", {}, "sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ=="], | ||||||
|  |  | ||||||
|     "i18next": ["i18next@25.3.0", "", { "dependencies": { "@babel/runtime": "^7.27.6" }, "peerDependencies": { "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-ZSQIiNGfqSG6yoLHaCvrkPp16UejHI8PCDxFYaNG/1qxtmqNmqEg4JlWKlxkrUmrin2sEjsy+Mjy1TRozBhOgw=="], |     "i18next": ["i18next@25.3.2", "", { "dependencies": { "@babel/runtime": "^7.27.6" }, "peerDependencies": { "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-JSnbZDxRVbphc5jiptxr3o2zocy5dEqpVm9qCGdJwRNO+9saUJS0/u4LnM/13C23fUEWxAylPqKU/NpMV/IjqA=="], | ||||||
|  |  | ||||||
|     "i18next-browser-languagedetector": ["i18next-browser-languagedetector@8.2.0", "", { "dependencies": { "@babel/runtime": "^7.23.2" } }, "sha512-P+3zEKLnOF0qmiesW383vsLdtQVyKtCNA9cjSoKCppTKPQVfKd2W8hbVo5ZhNJKDqeM7BOcvNoKJOjpHh4Js9g=="], |     "i18next-browser-languagedetector": ["i18next-browser-languagedetector@8.2.0", "", { "dependencies": { "@babel/runtime": "^7.23.2" } }, "sha512-P+3zEKLnOF0qmiesW383vsLdtQVyKtCNA9cjSoKCppTKPQVfKd2W8hbVo5ZhNJKDqeM7BOcvNoKJOjpHh4Js9g=="], | ||||||
|  |  | ||||||
| @@ -636,27 +638,27 @@ | |||||||
|  |  | ||||||
|     "levn": ["levn@0.4.1", "", { "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" } }, "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="], |     "levn": ["levn@0.4.1", "", { "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" } }, "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="], | ||||||
|  |  | ||||||
|     "lightningcss": ["lightningcss@1.29.2", "", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-darwin-arm64": "1.29.2", "lightningcss-darwin-x64": "1.29.2", "lightningcss-freebsd-x64": "1.29.2", "lightningcss-linux-arm-gnueabihf": "1.29.2", "lightningcss-linux-arm64-gnu": "1.29.2", "lightningcss-linux-arm64-musl": "1.29.2", "lightningcss-linux-x64-gnu": "1.29.2", "lightningcss-linux-x64-musl": "1.29.2", "lightningcss-win32-arm64-msvc": "1.29.2", "lightningcss-win32-x64-msvc": "1.29.2" } }, "sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA=="], |     "lightningcss": ["lightningcss@1.30.1", "", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-darwin-arm64": "1.30.1", "lightningcss-darwin-x64": "1.30.1", "lightningcss-freebsd-x64": "1.30.1", "lightningcss-linux-arm-gnueabihf": "1.30.1", "lightningcss-linux-arm64-gnu": "1.30.1", "lightningcss-linux-arm64-musl": "1.30.1", "lightningcss-linux-x64-gnu": "1.30.1", "lightningcss-linux-x64-musl": "1.30.1", "lightningcss-win32-arm64-msvc": "1.30.1", "lightningcss-win32-x64-msvc": "1.30.1" } }, "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg=="], | ||||||
|  |  | ||||||
|     "lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.29.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-cK/eMabSViKn/PG8U/a7aCorpeKLMlK0bQeNHmdb7qUnBkNPnL+oV5DjJUo0kqWsJUapZsM4jCfYItbqBDvlcA=="], |     "lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.30.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ=="], | ||||||
|  |  | ||||||
|     "lightningcss-darwin-x64": ["lightningcss-darwin-x64@1.29.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-j5qYxamyQw4kDXX5hnnCKMf3mLlHvG44f24Qyi2965/Ycz829MYqjrVg2H8BidybHBp9kom4D7DR5VqCKDXS0w=="], |     "lightningcss-darwin-x64": ["lightningcss-darwin-x64@1.30.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA=="], | ||||||
|  |  | ||||||
|     "lightningcss-freebsd-x64": ["lightningcss-freebsd-x64@1.29.2", "", { "os": "freebsd", "cpu": "x64" }, "sha512-wDk7M2tM78Ii8ek9YjnY8MjV5f5JN2qNVO+/0BAGZRvXKtQrBC4/cn4ssQIpKIPP44YXw6gFdpUF+Ps+RGsCwg=="], |     "lightningcss-freebsd-x64": ["lightningcss-freebsd-x64@1.30.1", "", { "os": "freebsd", "cpu": "x64" }, "sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig=="], | ||||||
|  |  | ||||||
|     "lightningcss-linux-arm-gnueabihf": ["lightningcss-linux-arm-gnueabihf@1.29.2", "", { "os": "linux", "cpu": "arm" }, "sha512-IRUrOrAF2Z+KExdExe3Rz7NSTuuJ2HvCGlMKoquK5pjvo2JY4Rybr+NrKnq0U0hZnx5AnGsuFHjGnNT14w26sg=="], |     "lightningcss-linux-arm-gnueabihf": ["lightningcss-linux-arm-gnueabihf@1.30.1", "", { "os": "linux", "cpu": "arm" }, "sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q=="], | ||||||
|  |  | ||||||
|     "lightningcss-linux-arm64-gnu": ["lightningcss-linux-arm64-gnu@1.29.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-KKCpOlmhdjvUTX/mBuaKemp0oeDIBBLFiU5Fnqxh1/DZ4JPZi4evEH7TKoSBFOSOV3J7iEmmBaw/8dpiUvRKlQ=="], |     "lightningcss-linux-arm64-gnu": ["lightningcss-linux-arm64-gnu@1.30.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw=="], | ||||||
|  |  | ||||||
|     "lightningcss-linux-arm64-musl": ["lightningcss-linux-arm64-musl@1.29.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-Q64eM1bPlOOUgxFmoPUefqzY1yV3ctFPE6d/Vt7WzLW4rKTv7MyYNky+FWxRpLkNASTnKQUaiMJ87zNODIrrKQ=="], |     "lightningcss-linux-arm64-musl": ["lightningcss-linux-arm64-musl@1.30.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ=="], | ||||||
|  |  | ||||||
|     "lightningcss-linux-x64-gnu": ["lightningcss-linux-x64-gnu@1.29.2", "", { "os": "linux", "cpu": "x64" }, "sha512-0v6idDCPG6epLXtBH/RPkHvYx74CVziHo6TMYga8O2EiQApnUPZsbR9nFNrg2cgBzk1AYqEd95TlrsL7nYABQg=="], |     "lightningcss-linux-x64-gnu": ["lightningcss-linux-x64-gnu@1.30.1", "", { "os": "linux", "cpu": "x64" }, "sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw=="], | ||||||
|  |  | ||||||
|     "lightningcss-linux-x64-musl": ["lightningcss-linux-x64-musl@1.29.2", "", { "os": "linux", "cpu": "x64" }, "sha512-rMpz2yawkgGT8RULc5S4WiZopVMOFWjiItBT7aSfDX4NQav6M44rhn5hjtkKzB+wMTRlLLqxkeYEtQ3dd9696w=="], |     "lightningcss-linux-x64-musl": ["lightningcss-linux-x64-musl@1.30.1", "", { "os": "linux", "cpu": "x64" }, "sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ=="], | ||||||
|  |  | ||||||
|     "lightningcss-win32-arm64-msvc": ["lightningcss-win32-arm64-msvc@1.29.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-nL7zRW6evGQqYVu/bKGK+zShyz8OVzsCotFgc7judbt6wnB2KbiKKJwBE4SGoDBQ1O94RjW4asrCjQL4i8Fhbw=="], |     "lightningcss-win32-arm64-msvc": ["lightningcss-win32-arm64-msvc@1.30.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA=="], | ||||||
|  |  | ||||||
|     "lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.29.2", "", { "os": "win32", "cpu": "x64" }, "sha512-EdIUW3B2vLuHmv7urfzMI/h2fmlnOQBk1xlsDxkN1tCWKjNFjfLhGxYk8C8mzpSfr+A6jFFIi8fU6LbQGsRWjA=="], |     "lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.30.1", "", { "os": "win32", "cpu": "x64" }, "sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg=="], | ||||||
|  |  | ||||||
|     "locate-path": ["locate-path@6.0.0", "", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="], |     "locate-path": ["locate-path@6.0.0", "", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="], | ||||||
|  |  | ||||||
| @@ -666,7 +668,7 @@ | |||||||
|  |  | ||||||
|     "lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="], |     "lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="], | ||||||
|  |  | ||||||
|     "lucide-react": ["lucide-react@0.525.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-Tm1txJ2OkymCGkvwoHt33Y2JpN5xucVq1slHcgE6Lk0WjDfjgKWor5CdVER8U6DvcfMwh4M8XxmpTiyzfmfDYQ=="], |     "lucide-react": ["lucide-react@0.539.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-VVISr+VF2krO91FeuCrm1rSOLACQUYVy7NQkzrOty52Y8TlTPcXcMdQFj9bYzBgXbWCiywlwSZ3Z8u6a+6bMlg=="], | ||||||
|  |  | ||||||
|     "magic-string": ["magic-string@0.30.17", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" } }, "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA=="], |     "magic-string": ["magic-string@0.30.17", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" } }, "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA=="], | ||||||
|  |  | ||||||
| @@ -772,9 +774,9 @@ | |||||||
|  |  | ||||||
|     "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], |     "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], | ||||||
|  |  | ||||||
|     "picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="], |     "picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="], | ||||||
|  |  | ||||||
|     "postcss": ["postcss@8.5.3", "", { "dependencies": { "nanoid": "^3.3.8", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A=="], |     "postcss": ["postcss@8.5.6", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg=="], | ||||||
|  |  | ||||||
|     "prelude-ls": ["prelude-ls@1.2.1", "", {}, "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="], |     "prelude-ls": ["prelude-ls@1.2.1", "", {}, "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="], | ||||||
|  |  | ||||||
| @@ -788,13 +790,13 @@ | |||||||
|  |  | ||||||
|     "queue-microtask": ["queue-microtask@1.2.3", "", {}, "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="], |     "queue-microtask": ["queue-microtask@1.2.3", "", {}, "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="], | ||||||
|  |  | ||||||
|     "react": ["react@19.1.0", "", {}, "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg=="], |     "react": ["react@19.1.1", "", {}, "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ=="], | ||||||
|  |  | ||||||
|     "react-dom": ["react-dom@19.1.0", "", { "dependencies": { "scheduler": "^0.26.0" }, "peerDependencies": { "react": "^19.1.0" } }, "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g=="], |     "react-dom": ["react-dom@19.1.1", "", { "dependencies": { "scheduler": "^0.26.0" }, "peerDependencies": { "react": "^19.1.1" } }, "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw=="], | ||||||
|  |  | ||||||
|     "react-hook-form": ["react-hook-form@7.59.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-kmkek2/8grqarTJExFNjy+RXDIP8yM+QTl3QL6m6Q8b2bih4ltmiXxH7T9n+yXNK477xPh5yZT/6vD8sYGzJTA=="], |     "react-hook-form": ["react-hook-form@7.62.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-7KWFejc98xqG/F4bAxpL41NB3o1nnvQO1RWZT3TqRZYL8RryQETGfEdVnJN2fy1crCiBLLjkRBVK05j24FxJGA=="], | ||||||
|  |  | ||||||
|     "react-i18next": ["react-i18next@15.5.3", "", { "dependencies": { "@babel/runtime": "^7.27.6", "html-parse-stringify": "^3.0.1" }, "peerDependencies": { "i18next": ">= 23.2.3", "react": ">= 16.8.0", "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-ypYmOKOnjqPEJZO4m1BI0kS8kWqkBNsKYyhVUfij0gvjy9xJNoG/VcGkxq5dRlVwzmrmY1BQMAmpbbUBLwC4Kw=="], |     "react-i18next": ["react-i18next@15.6.1", "", { "dependencies": { "@babel/runtime": "^7.27.6", "html-parse-stringify": "^3.0.1" }, "peerDependencies": { "i18next": ">= 23.2.3", "react": ">= 16.8.0", "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-uGrzSsOUUe2sDBG/+FJq2J1MM+Y4368/QW8OLEKSFvnDflHBbZhSd1u3UkW0Z06rMhZmnB/AQrhCpYfE5/5XNg=="], | ||||||
|  |  | ||||||
|     "react-markdown": ["react-markdown@10.1.0", "", { "dependencies": { "@types/hast": "^3.0.0", "@types/mdast": "^4.0.0", "devlop": "^1.0.0", "hast-util-to-jsx-runtime": "^2.0.0", "html-url-attributes": "^3.0.0", "mdast-util-to-hast": "^13.0.0", "remark-parse": "^11.0.0", "remark-rehype": "^11.0.0", "unified": "^11.0.0", "unist-util-visit": "^5.0.0", "vfile": "^6.0.0" }, "peerDependencies": { "@types/react": ">=18", "react": ">=18" } }, "sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ=="], |     "react-markdown": ["react-markdown@10.1.0", "", { "dependencies": { "@types/hast": "^3.0.0", "@types/mdast": "^4.0.0", "devlop": "^1.0.0", "hast-util-to-jsx-runtime": "^2.0.0", "html-url-attributes": "^3.0.0", "mdast-util-to-hast": "^13.0.0", "remark-parse": "^11.0.0", "remark-rehype": "^11.0.0", "unified": "^11.0.0", "unist-util-visit": "^5.0.0", "vfile": "^6.0.0" }, "peerDependencies": { "@types/react": ">=18", "react": ">=18" } }, "sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ=="], | ||||||
|  |  | ||||||
| @@ -804,7 +806,7 @@ | |||||||
|  |  | ||||||
|     "react-remove-scroll-bar": ["react-remove-scroll-bar@2.3.8", "", { "dependencies": { "react-style-singleton": "^2.2.2", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "optionalPeers": ["@types/react"] }, "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q=="], |     "react-remove-scroll-bar": ["react-remove-scroll-bar@2.3.8", "", { "dependencies": { "react-style-singleton": "^2.2.2", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "optionalPeers": ["@types/react"] }, "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q=="], | ||||||
|  |  | ||||||
|     "react-router": ["react-router@7.6.3", "", { "dependencies": { "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" }, "optionalPeers": ["react-dom"] }, "sha512-zf45LZp5skDC6I3jDLXQUu0u26jtuP4lEGbc7BbdyxenBN1vJSTA18czM2D+h5qyMBuMrD+9uB+mU37HIoKGRA=="], |     "react-router": ["react-router@7.8.0", "", { "dependencies": { "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" }, "optionalPeers": ["react-dom"] }, "sha512-r15M3+LHKgM4SOapNmsH3smAizWds1vJ0Z9C4mWaKnT9/wD7+d/0jYcj6LmOvonkrO4Rgdyp4KQ/29gWN2i1eg=="], | ||||||
|  |  | ||||||
|     "react-style-singleton": ["react-style-singleton@2.2.3", "", { "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ=="], |     "react-style-singleton": ["react-style-singleton@2.2.3", "", { "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ=="], | ||||||
|  |  | ||||||
| @@ -816,7 +818,7 @@ | |||||||
|  |  | ||||||
|     "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="], |     "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="], | ||||||
|  |  | ||||||
|     "rollup": ["rollup@4.40.2", "", { "dependencies": { "@types/estree": "1.0.7" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.40.2", "@rollup/rollup-android-arm64": "4.40.2", "@rollup/rollup-darwin-arm64": "4.40.2", "@rollup/rollup-darwin-x64": "4.40.2", "@rollup/rollup-freebsd-arm64": "4.40.2", "@rollup/rollup-freebsd-x64": "4.40.2", "@rollup/rollup-linux-arm-gnueabihf": "4.40.2", "@rollup/rollup-linux-arm-musleabihf": "4.40.2", "@rollup/rollup-linux-arm64-gnu": "4.40.2", "@rollup/rollup-linux-arm64-musl": "4.40.2", "@rollup/rollup-linux-loongarch64-gnu": "4.40.2", "@rollup/rollup-linux-powerpc64le-gnu": "4.40.2", "@rollup/rollup-linux-riscv64-gnu": "4.40.2", "@rollup/rollup-linux-riscv64-musl": "4.40.2", "@rollup/rollup-linux-s390x-gnu": "4.40.2", "@rollup/rollup-linux-x64-gnu": "4.40.2", "@rollup/rollup-linux-x64-musl": "4.40.2", "@rollup/rollup-win32-arm64-msvc": "4.40.2", "@rollup/rollup-win32-ia32-msvc": "4.40.2", "@rollup/rollup-win32-x64-msvc": "4.40.2", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg=="], |     "rollup": ["rollup@4.46.2", "", { "dependencies": { "@types/estree": "1.0.8" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.46.2", "@rollup/rollup-android-arm64": "4.46.2", "@rollup/rollup-darwin-arm64": "4.46.2", "@rollup/rollup-darwin-x64": "4.46.2", "@rollup/rollup-freebsd-arm64": "4.46.2", "@rollup/rollup-freebsd-x64": "4.46.2", "@rollup/rollup-linux-arm-gnueabihf": "4.46.2", "@rollup/rollup-linux-arm-musleabihf": "4.46.2", "@rollup/rollup-linux-arm64-gnu": "4.46.2", "@rollup/rollup-linux-arm64-musl": "4.46.2", "@rollup/rollup-linux-loongarch64-gnu": "4.46.2", "@rollup/rollup-linux-ppc64-gnu": "4.46.2", "@rollup/rollup-linux-riscv64-gnu": "4.46.2", "@rollup/rollup-linux-riscv64-musl": "4.46.2", "@rollup/rollup-linux-s390x-gnu": "4.46.2", "@rollup/rollup-linux-x64-gnu": "4.46.2", "@rollup/rollup-linux-x64-musl": "4.46.2", "@rollup/rollup-win32-arm64-msvc": "4.46.2", "@rollup/rollup-win32-ia32-msvc": "4.46.2", "@rollup/rollup-win32-x64-msvc": "4.46.2", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg=="], | ||||||
|  |  | ||||||
|     "run-parallel": ["run-parallel@1.2.0", "", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="], |     "run-parallel": ["run-parallel@1.2.0", "", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="], | ||||||
|  |  | ||||||
| @@ -830,7 +832,7 @@ | |||||||
|  |  | ||||||
|     "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="], |     "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="], | ||||||
|  |  | ||||||
|     "sonner": ["sonner@2.0.5", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-YwbHQO6cSso3HBXlbCkgrgzDNIhws14r4MO87Ofy+cV2X7ES4pOoAK3+veSmVTvqNx1BWUxlhPmZzP00Crk2aQ=="], |     "sonner": ["sonner@2.0.7", "", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w=="], | ||||||
|  |  | ||||||
|     "source-map-js": ["source-map-js@1.2.1", "", {}, "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="], |     "source-map-js": ["source-map-js@1.2.1", "", {}, "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="], | ||||||
|  |  | ||||||
| @@ -854,7 +856,7 @@ | |||||||
|  |  | ||||||
|     "tar": ["tar@7.4.3", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.0.1", "mkdirp": "^3.0.1", "yallist": "^5.0.0" } }, "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw=="], |     "tar": ["tar@7.4.3", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.0.1", "mkdirp": "^3.0.1", "yallist": "^5.0.0" } }, "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw=="], | ||||||
|  |  | ||||||
|     "tinyglobby": ["tinyglobby@0.2.13", "", { "dependencies": { "fdir": "^6.4.4", "picomatch": "^4.0.2" } }, "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw=="], |     "tinyglobby": ["tinyglobby@0.2.14", "", { "dependencies": { "fdir": "^6.4.4", "picomatch": "^4.0.2" } }, "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ=="], | ||||||
|  |  | ||||||
|     "to-regex-range": ["to-regex-range@5.0.1", "", { "dependencies": { "is-number": "^7.0.0" } }, "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="], |     "to-regex-range": ["to-regex-range@5.0.1", "", { "dependencies": { "is-number": "^7.0.0" } }, "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="], | ||||||
|  |  | ||||||
| @@ -866,15 +868,15 @@ | |||||||
|  |  | ||||||
|     "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], |     "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], | ||||||
|  |  | ||||||
|     "tw-animate-css": ["tw-animate-css@1.3.4", "", {}, "sha512-dd1Ht6/YQHcNbq0znIT6dG8uhO7Ce+VIIhZUhjsryXsMPJQz3bZg7Q2eNzLwipb25bRZslGb2myio5mScd1TFg=="], |     "tw-animate-css": ["tw-animate-css@1.3.6", "", {}, "sha512-9dy0R9UsYEGmgf26L8UcHiLmSFTHa9+D7+dAt/G/sF5dCnPePZbfgDYinc7/UzAM7g/baVrmS6m9yEpU46d+LA=="], | ||||||
|  |  | ||||||
|     "type-check": ["type-check@0.4.0", "", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="], |     "type-check": ["type-check@0.4.0", "", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="], | ||||||
|  |  | ||||||
|     "typescript": ["typescript@5.8.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ=="], |     "typescript": ["typescript@5.9.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A=="], | ||||||
|  |  | ||||||
|     "typescript-eslint": ["typescript-eslint@8.35.1", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.35.1", "@typescript-eslint/parser": "8.35.1", "@typescript-eslint/utils": "8.35.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw=="], |     "typescript-eslint": ["typescript-eslint@8.39.0", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.39.0", "@typescript-eslint/parser": "8.39.0", "@typescript-eslint/typescript-estree": "8.39.0", "@typescript-eslint/utils": "8.39.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-lH8FvtdtzcHJCkMOKnN73LIn6SLTpoojgJqDAxPm1jCR14eWSGPX8ul/gggBdPMk/d5+u9V854vTYQ8T5jF/1Q=="], | ||||||
|  |  | ||||||
|     "undici-types": ["undici-types@7.8.0", "", {}, "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw=="], |     "undici-types": ["undici-types@7.10.0", "", {}, "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag=="], | ||||||
|  |  | ||||||
|     "unified": ["unified@11.0.5", "", { "dependencies": { "@types/unist": "^3.0.0", "bail": "^2.0.0", "devlop": "^1.0.0", "extend": "^3.0.0", "is-plain-obj": "^4.0.0", "trough": "^2.0.0", "vfile": "^6.0.0" } }, "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA=="], |     "unified": ["unified@11.0.5", "", { "dependencies": { "@types/unist": "^3.0.0", "bail": "^2.0.0", "devlop": "^1.0.0", "extend": "^3.0.0", "is-plain-obj": "^4.0.0", "trough": "^2.0.0", "vfile": "^6.0.0" } }, "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA=="], | ||||||
|  |  | ||||||
| @@ -900,7 +902,7 @@ | |||||||
|  |  | ||||||
|     "vfile-message": ["vfile-message@4.0.2", "", { "dependencies": { "@types/unist": "^3.0.0", "unist-util-stringify-position": "^4.0.0" } }, "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw=="], |     "vfile-message": ["vfile-message@4.0.2", "", { "dependencies": { "@types/unist": "^3.0.0", "unist-util-stringify-position": "^4.0.0" } }, "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw=="], | ||||||
|  |  | ||||||
|     "vite": ["vite@6.3.5", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", "picomatch": "^4.0.2", "postcss": "^8.5.3", "rollup": "^4.34.9", "tinyglobby": "^0.2.13" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ=="], |     "vite": ["vite@7.1.1", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.6", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.14" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-yJ+Mp7OyV+4S+afWo+QyoL9jFWD11QFH0i5i7JypnfTcA1rmgxCbiA8WwAICDEtZ1Z1hzrVhN8R8rGTqkTY8ZQ=="], | ||||||
|  |  | ||||||
|     "void-elements": ["void-elements@3.1.0", "", {}, "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="], |     "void-elements": ["void-elements@3.1.0", "", {}, "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="], | ||||||
|  |  | ||||||
| @@ -912,20 +914,26 @@ | |||||||
|  |  | ||||||
|     "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="], |     "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="], | ||||||
|  |  | ||||||
|     "zod": ["zod@3.25.67", "", {}, "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw=="], |     "zod": ["zod@4.0.15", "", {}, "sha512-2IVHb9h4Mt6+UXkyMs0XbfICUh1eUrlJJAOupBHUhLRnKkruawyDddYRCs0Eizt900ntIMk9/4RksYl+FgSpcQ=="], | ||||||
|  |  | ||||||
|     "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="], |     "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="], | ||||||
|  |  | ||||||
|  |     "@babel/generator/@jridgewell/gen-mapping": ["@jridgewell/gen-mapping@0.3.12", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg=="], | ||||||
|  |  | ||||||
|  |     "@babel/generator/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.29", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ=="], | ||||||
|  |  | ||||||
|     "@babel/helper-module-imports/@babel/traverse": ["@babel/traverse@7.27.1", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.27.1", "@babel/parser": "^7.27.1", "@babel/template": "^7.27.1", "@babel/types": "^7.27.1", "debug": "^4.3.1", "globals": "^11.1.0" } }, "sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg=="], |     "@babel/helper-module-imports/@babel/traverse": ["@babel/traverse@7.27.1", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.27.1", "@babel/parser": "^7.27.1", "@babel/template": "^7.27.1", "@babel/types": "^7.27.1", "debug": "^4.3.1", "globals": "^11.1.0" } }, "sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg=="], | ||||||
|  |  | ||||||
|     "@babel/helper-module-imports/@babel/types": ["@babel/types@7.27.1", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q=="], |     "@babel/helper-module-imports/@babel/types": ["@babel/types@7.27.1", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q=="], | ||||||
|  |  | ||||||
|  |     "@babel/helper-module-transforms/@babel/traverse": ["@babel/traverse@7.27.4", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.27.3", "@babel/parser": "^7.27.4", "@babel/template": "^7.27.2", "@babel/types": "^7.27.3", "debug": "^4.3.1", "globals": "^11.1.0" } }, "sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA=="], | ||||||
|  |  | ||||||
|  |     "@babel/helpers/@babel/types": ["@babel/types@7.27.6", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q=="], | ||||||
|  |  | ||||||
|     "@babel/template/@babel/parser": ["@babel/parser@7.27.2", "", { "dependencies": { "@babel/types": "^7.27.1" }, "bin": "./bin/babel-parser.js" }, "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw=="], |     "@babel/template/@babel/parser": ["@babel/parser@7.27.2", "", { "dependencies": { "@babel/types": "^7.27.1" }, "bin": "./bin/babel-parser.js" }, "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw=="], | ||||||
|  |  | ||||||
|     "@babel/template/@babel/types": ["@babel/types@7.27.1", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q=="], |     "@babel/template/@babel/types": ["@babel/types@7.27.1", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q=="], | ||||||
|  |  | ||||||
|     "@babel/traverse/globals": ["globals@11.12.0", "", {}, "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="], |  | ||||||
|  |  | ||||||
|     "@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="], |     "@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="], | ||||||
|  |  | ||||||
|     "@eslint/eslintrc/espree": ["espree@10.3.0", "", { "dependencies": { "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^4.2.0" } }, "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg=="], |     "@eslint/eslintrc/espree": ["espree@10.3.0", "", { "dependencies": { "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^4.2.0" } }, "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg=="], | ||||||
| @@ -934,8 +942,6 @@ | |||||||
|  |  | ||||||
|     "@humanfs/node/@humanwhocodes/retry": ["@humanwhocodes/retry@0.3.1", "", {}, "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA=="], |     "@humanfs/node/@humanwhocodes/retry": ["@humanwhocodes/retry@0.3.1", "", {}, "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA=="], | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss": ["lightningcss@1.30.1", "", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-darwin-arm64": "1.30.1", "lightningcss-darwin-x64": "1.30.1", "lightningcss-freebsd-x64": "1.30.1", "lightningcss-linux-arm-gnueabihf": "1.30.1", "lightningcss-linux-arm64-gnu": "1.30.1", "lightningcss-linux-arm64-musl": "1.30.1", "lightningcss-linux-x64-gnu": "1.30.1", "lightningcss-linux-x64-musl": "1.30.1", "lightningcss-win32-arm64-msvc": "1.30.1", "lightningcss-win32-x64-msvc": "1.30.1" } }, "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.4.3", "", { "dependencies": { "@emnapi/wasi-threads": "1.0.2", "tslib": "^2.4.0" }, "bundled": true }, "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g=="], |     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.4.3", "", { "dependencies": { "@emnapi/wasi-threads": "1.0.2", "tslib": "^2.4.0" }, "bundled": true }, "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g=="], | ||||||
|  |  | ||||||
|     "@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.4.3", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ=="], |     "@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.4.3", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ=="], | ||||||
| @@ -960,31 +966,33 @@ | |||||||
|  |  | ||||||
|     "@types/babel__traverse/@babel/types": ["@babel/types@7.27.1", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q=="], |     "@types/babel__traverse/@babel/types": ["@babel/types@7.27.1", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.35.1", "", { "dependencies": { "@typescript-eslint/types": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1" } }, "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg=="], |     "@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.39.0", "", { "dependencies": { "@typescript-eslint/types": "8.39.0", "@typescript-eslint/visitor-keys": "8.39.0" } }, "sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils": ["@typescript-eslint/utils@8.35.1", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.35.1", "@typescript-eslint/types": "8.35.1", "@typescript-eslint/typescript-estree": "8.35.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ=="], |     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils": ["@typescript-eslint/utils@8.39.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.39.0", "@typescript-eslint/types": "8.39.0", "@typescript-eslint/typescript-estree": "8.39.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.4", "", {}, "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A=="], |     "@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.4", "", {}, "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/parser/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.35.1", "", { "dependencies": { "@typescript-eslint/types": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1" } }, "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg=="], |     "@typescript-eslint/parser/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.39.0", "", { "dependencies": { "@typescript-eslint/types": "8.39.0", "@typescript-eslint/visitor-keys": "8.39.0" } }, "sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/parser/@typescript-eslint/types": ["@typescript-eslint/types@8.35.1", "", {}, "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ=="], |     "@typescript-eslint/parser/@typescript-eslint/types": ["@typescript-eslint/types@8.39.0", "", {}, "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/parser/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.35.1", "", { "dependencies": { "@typescript-eslint/project-service": "8.35.1", "@typescript-eslint/tsconfig-utils": "8.35.1", "@typescript-eslint/types": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g=="], |     "@typescript-eslint/project-service/@typescript-eslint/types": ["@typescript-eslint/types@8.39.0", "", {}, "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/scope-manager/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.34.1", "", { "dependencies": { "@typescript-eslint/types": "8.34.1", "eslint-visitor-keys": "^4.2.1" } }, "sha512-xoh5rJ+tgsRKoXnkBPFRLZ7rjKM0AfVbC68UZ/ECXoDbfggb9RbEySN359acY1vS3qZ0jVTVWzbtfapwm5ztxw=="], |     "@typescript-eslint/scope-manager/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.38.0", "", { "dependencies": { "@typescript-eslint/types": "8.38.0", "eslint-visitor-keys": "^4.2.1" } }, "sha512-pWrTcoFNWuwHlA9CvlfSsGWs14JxfN1TH25zM5L7o0pRLhsoZkDnTsXfQRJBEWJoV5DL0jf+Z+sxiud+K0mq1g=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.35.1", "", { "dependencies": { "@typescript-eslint/project-service": "8.35.1", "@typescript-eslint/tsconfig-utils": "8.35.1", "@typescript-eslint/types": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g=="], |     "@typescript-eslint/type-utils/@typescript-eslint/types": ["@typescript-eslint/types@8.39.0", "", {}, "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/utils": ["@typescript-eslint/utils@8.35.1", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.35.1", "@typescript-eslint/types": "8.35.1", "@typescript-eslint/typescript-estree": "8.35.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ=="], |     "@typescript-eslint/type-utils/@typescript-eslint/utils": ["@typescript-eslint/utils@8.39.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.39.0", "@typescript-eslint/types": "8.39.0", "@typescript-eslint/typescript-estree": "8.39.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/typescript-estree/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.34.1", "", { "dependencies": { "@typescript-eslint/types": "8.34.1", "eslint-visitor-keys": "^4.2.1" } }, "sha512-xoh5rJ+tgsRKoXnkBPFRLZ7rjKM0AfVbC68UZ/ECXoDbfggb9RbEySN359acY1vS3qZ0jVTVWzbtfapwm5ztxw=="], |     "@typescript-eslint/typescript-estree/@typescript-eslint/types": ["@typescript-eslint/types@8.39.0", "", {}, "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], |     "@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/typescript-estree/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="], |     "@typescript-eslint/typescript-estree/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/visitor-keys/@typescript-eslint/types": ["@typescript-eslint/types@8.35.1", "", {}, "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ=="], |     "@typescript-eslint/utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.38.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.38.0", "@typescript-eslint/tsconfig-utils": "8.38.0", "@typescript-eslint/types": "8.38.0", "@typescript-eslint/visitor-keys": "8.38.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-fooELKcAKzxux6fA6pxOflpNS0jc+nOQEEOipXFNjSlBS6fqrJOVY/whSn70SScHrcJ2LDsxWrneFoWYSVfqhQ=="], | ||||||
|  |  | ||||||
|  |     "@typescript-eslint/visitor-keys/@typescript-eslint/types": ["@typescript-eslint/types@8.39.0", "", {}, "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg=="], | ||||||
|  |  | ||||||
|     "fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="], |     "fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="], | ||||||
|  |  | ||||||
| @@ -998,7 +1006,11 @@ | |||||||
|  |  | ||||||
|     "parse-entities/@types/unist": ["@types/unist@2.0.11", "", {}, "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA=="], |     "parse-entities/@types/unist": ["@types/unist@2.0.11", "", {}, "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA=="], | ||||||
|  |  | ||||||
|     "typescript-eslint/@typescript-eslint/utils": ["@typescript-eslint/utils@8.35.1", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.35.1", "@typescript-eslint/types": "8.35.1", "@typescript-eslint/typescript-estree": "8.35.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ=="], |     "rollup/@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="], | ||||||
|  |  | ||||||
|  |     "tinyglobby/picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="], | ||||||
|  |  | ||||||
|  |     "typescript-eslint/@typescript-eslint/utils": ["@typescript-eslint/utils@8.39.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.39.0", "@typescript-eslint/types": "8.39.0", "@typescript-eslint/typescript-estree": "8.39.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ=="], | ||||||
|  |  | ||||||
|     "@babel/helper-module-imports/@babel/traverse/@babel/generator": ["@babel/generator@7.27.1", "", { "dependencies": { "@babel/parser": "^7.27.1", "@babel/types": "^7.27.1", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" } }, "sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w=="], |     "@babel/helper-module-imports/@babel/traverse/@babel/generator": ["@babel/generator@7.27.1", "", { "dependencies": { "@babel/parser": "^7.27.1", "@babel/types": "^7.27.1", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" } }, "sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w=="], | ||||||
|  |  | ||||||
| @@ -1006,30 +1018,18 @@ | |||||||
|  |  | ||||||
|     "@babel/helper-module-imports/@babel/traverse/globals": ["globals@11.12.0", "", {}, "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="], |     "@babel/helper-module-imports/@babel/traverse/globals": ["globals@11.12.0", "", {}, "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="], | ||||||
|  |  | ||||||
|  |     "@babel/helper-module-transforms/@babel/traverse/@babel/generator": ["@babel/generator@7.27.5", "", { "dependencies": { "@babel/parser": "^7.27.5", "@babel/types": "^7.27.3", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" } }, "sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw=="], | ||||||
|  |  | ||||||
|  |     "@babel/helper-module-transforms/@babel/traverse/@babel/parser": ["@babel/parser@7.27.5", "", { "dependencies": { "@babel/types": "^7.27.3" }, "bin": "./bin/babel-parser.js" }, "sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg=="], | ||||||
|  |  | ||||||
|  |     "@babel/helper-module-transforms/@babel/traverse/@babel/types": ["@babel/types@7.27.6", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q=="], | ||||||
|  |  | ||||||
|  |     "@babel/helper-module-transforms/@babel/traverse/globals": ["globals@11.12.0", "", {}, "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="], | ||||||
|  |  | ||||||
|     "@eslint/eslintrc/espree/acorn": ["acorn@8.14.1", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg=="], |     "@eslint/eslintrc/espree/acorn": ["acorn@8.14.1", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg=="], | ||||||
|  |  | ||||||
|     "@eslint/eslintrc/espree/eslint-visitor-keys": ["eslint-visitor-keys@4.2.0", "", {}, "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw=="], |     "@eslint/eslintrc/espree/eslint-visitor-keys": ["eslint-visitor-keys@4.2.0", "", {}, "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw=="], | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.30.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-darwin-x64": ["lightningcss-darwin-x64@1.30.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-freebsd-x64": ["lightningcss-freebsd-x64@1.30.1", "", { "os": "freebsd", "cpu": "x64" }, "sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-linux-arm-gnueabihf": ["lightningcss-linux-arm-gnueabihf@1.30.1", "", { "os": "linux", "cpu": "arm" }, "sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-linux-arm64-gnu": ["lightningcss-linux-arm64-gnu@1.30.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-linux-arm64-musl": ["lightningcss-linux-arm64-musl@1.30.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-linux-x64-gnu": ["lightningcss-linux-x64-gnu@1.30.1", "", { "os": "linux", "cpu": "x64" }, "sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-linux-x64-musl": ["lightningcss-linux-x64-musl@1.30.1", "", { "os": "linux", "cpu": "x64" }, "sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-win32-arm64-msvc": ["lightningcss-win32-arm64-msvc@1.30.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/node/lightningcss/lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.30.1", "", { "os": "win32", "cpu": "x64" }, "sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg=="], |  | ||||||
|  |  | ||||||
|     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core/@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.0.2", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA=="], |     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core/@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.0.2", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA=="], | ||||||
|  |  | ||||||
|     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], |     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], | ||||||
| @@ -1040,66 +1040,30 @@ | |||||||
|  |  | ||||||
|     "@tailwindcss/oxide-wasm32-wasi/@tybys/wasm-util/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], |     "@tailwindcss/oxide-wasm32-wasi/@tybys/wasm-util/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager/@typescript-eslint/types": ["@typescript-eslint/types@8.35.1", "", {}, "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ=="], |     "@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager/@typescript-eslint/types": ["@typescript-eslint/types@8.39.0", "", {}, "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.35.1", "", {}, "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ=="], |     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.39.0", "", {}, "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.35.1", "", { "dependencies": { "@typescript-eslint/project-service": "8.35.1", "@typescript-eslint/tsconfig-utils": "8.35.1", "@typescript-eslint/types": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g=="], |     "@typescript-eslint/type-utils/@typescript-eslint/utils/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.39.0", "", { "dependencies": { "@typescript-eslint/types": "8.39.0", "@typescript-eslint/visitor-keys": "8.39.0" } }, "sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/parser/@typescript-eslint/typescript-estree/@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.35.1", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.35.1", "@typescript-eslint/types": "^8.35.1", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/parser/@typescript-eslint/typescript-estree/@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.35.1", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/parser/@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/parser/@typescript-eslint/typescript-estree/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/typescript-estree/@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.35.1", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.35.1", "@typescript-eslint/types": "^8.35.1", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/typescript-estree/@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.35.1", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/typescript-estree/@typescript-eslint/types": ["@typescript-eslint/types@8.35.1", "", {}, "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/typescript-estree/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/utils/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.35.1", "", { "dependencies": { "@typescript-eslint/types": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1" } }, "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.35.1", "", {}, "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="], |     "@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="], | ||||||
|  |  | ||||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.35.1", "", { "dependencies": { "@typescript-eslint/types": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1" } }, "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg=="], |     "@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.38.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.38.0", "@typescript-eslint/types": "^8.38.0", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-dbK7Jvqcb8c9QfH01YB6pORpqX1mn5gDZc9n63Ak/+jD67oWXn3Gs0M6vddAN+eDXBCS5EmNWzbSxsn9SzFWWg=="], | ||||||
|  |  | ||||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.35.1", "", {}, "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ=="], |     "@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.38.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-Lum9RtSE3EroKk/bYns+sPOodqb2Fv50XOl/gMviMKNvanETUuUcC9ObRbzrJ4VSd2JalPqgSAavwrPiPvnAiQ=="], | ||||||
|  |  | ||||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.35.1", "", { "dependencies": { "@typescript-eslint/project-service": "8.35.1", "@typescript-eslint/tsconfig-utils": "8.35.1", "@typescript-eslint/types": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g=="], |     "@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.38.0", "", { "dependencies": { "@typescript-eslint/types": "8.38.0", "eslint-visitor-keys": "^4.2.1" } }, "sha512-pWrTcoFNWuwHlA9CvlfSsGWs14JxfN1TH25zM5L7o0pRLhsoZkDnTsXfQRJBEWJoV5DL0jf+Z+sxiud+K0mq1g=="], | ||||||
|  |  | ||||||
|  |     "@typescript-eslint/utils/@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], | ||||||
|  |  | ||||||
|  |     "@typescript-eslint/utils/@typescript-eslint/typescript-estree/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="], | ||||||
|  |  | ||||||
|  |     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.39.0", "", { "dependencies": { "@typescript-eslint/types": "8.39.0", "@typescript-eslint/visitor-keys": "8.39.0" } }, "sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A=="], | ||||||
|  |  | ||||||
|  |     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.39.0", "", {}, "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg=="], | ||||||
|  |  | ||||||
|     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core/@emnapi/wasi-threads/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], |     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core/@emnapi/wasi-threads/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.35.1", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.35.1", "@typescript-eslint/types": "^8.35.1", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q=="], |     "@typescript-eslint/utils/@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="], | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.35.1", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/parser/@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/type-utils/@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="], |  | ||||||
|  |  | ||||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.35.1", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.35.1", "@typescript-eslint/types": "^8.35.1", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q=="], |  | ||||||
|  |  | ||||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.35.1", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ=="], |  | ||||||
|  |  | ||||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], |  | ||||||
|  |  | ||||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/typescript-estree/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="], |  | ||||||
|  |  | ||||||
|     "@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="], |  | ||||||
|  |  | ||||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/typescript-estree/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="], |  | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -10,49 +10,49 @@ | |||||||
|     "preview": "vite preview" |     "preview": "vite preview" | ||||||
|   }, |   }, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@hookform/resolvers": "^5.1.1", |     "@hookform/resolvers": "^5.2.1", | ||||||
|     "@radix-ui/react-label": "^2.1.7", |     "@radix-ui/react-label": "^2.1.7", | ||||||
|     "@radix-ui/react-select": "^2.2.5", |     "@radix-ui/react-select": "^2.2.5", | ||||||
|     "@radix-ui/react-separator": "^1.1.7", |     "@radix-ui/react-separator": "^1.1.7", | ||||||
|     "@radix-ui/react-slot": "^1.2.3", |     "@radix-ui/react-slot": "^1.2.3", | ||||||
|     "@tailwindcss/vite": "^4.1.11", |     "@tailwindcss/vite": "^4.1.11", | ||||||
|     "@tanstack/react-query": "^5.81.5", |     "@tanstack/react-query": "^5.84.1", | ||||||
|     "axios": "^1.10.0", |     "axios": "^1.11.0", | ||||||
|     "class-variance-authority": "^0.7.1", |     "class-variance-authority": "^0.7.1", | ||||||
|     "clsx": "^2.1.1", |     "clsx": "^2.1.1", | ||||||
|     "dompurify": "^3.2.6", |     "dompurify": "^3.2.6", | ||||||
|     "i18next": "^25.3.0", |     "i18next": "^25.3.2", | ||||||
|     "i18next-browser-languagedetector": "^8.2.0", |     "i18next-browser-languagedetector": "^8.2.0", | ||||||
|     "i18next-resources-to-backend": "^1.2.1", |     "i18next-resources-to-backend": "^1.2.1", | ||||||
|     "input-otp": "^1.4.2", |     "input-otp": "^1.4.2", | ||||||
|     "lucide-react": "^0.525.0", |     "lucide-react": "^0.539.0", | ||||||
|     "next-themes": "^0.4.6", |     "next-themes": "^0.4.6", | ||||||
|     "react": "^19.0.0", |     "react": "^19.1.1", | ||||||
|     "react-dom": "^19.0.0", |     "react-dom": "^19.1.1", | ||||||
|     "react-hook-form": "^7.59.0", |     "react-hook-form": "^7.62.0", | ||||||
|     "react-i18next": "^15.5.3", |     "react-i18next": "^15.6.1", | ||||||
|     "react-markdown": "^10.1.0", |     "react-markdown": "^10.1.0", | ||||||
|     "react-router": "^7.6.3", |     "react-router": "^7.8.0", | ||||||
|     "sonner": "^2.0.5", |     "sonner": "^2.0.7", | ||||||
|     "tailwind-merge": "^3.3.1", |     "tailwind-merge": "^3.3.1", | ||||||
|     "tailwindcss": "^4.1.11", |     "tailwindcss": "^4.1.11", | ||||||
|     "zod": "^3.25.67" |     "zod": "^4.0.15" | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "@eslint/js": "^9.30.0", |     "@eslint/js": "^9.32.0", | ||||||
|     "@tanstack/eslint-plugin-query": "^5.81.2", |     "@tanstack/eslint-plugin-query": "^5.83.1", | ||||||
|     "@types/node": "^24.0.8", |     "@types/node": "^24.2.0", | ||||||
|     "@types/react": "^19.1.8", |     "@types/react": "^19.1.9", | ||||||
|     "@types/react-dom": "^19.1.6", |     "@types/react-dom": "^19.1.7", | ||||||
|     "@vitejs/plugin-react": "^4.6.0", |     "@vitejs/plugin-react": "^5.0.0", | ||||||
|     "eslint": "^9.30.0", |     "eslint": "^9.32.0", | ||||||
|     "eslint-plugin-react-hooks": "^5.2.0", |     "eslint-plugin-react-hooks": "^5.2.0", | ||||||
|     "eslint-plugin-react-refresh": "^0.4.19", |     "eslint-plugin-react-refresh": "^0.4.19", | ||||||
|     "globals": "^16.2.0", |     "globals": "^16.3.0", | ||||||
|     "prettier": "3.6.2", |     "prettier": "3.6.2", | ||||||
|     "tw-animate-css": "^1.3.4", |     "tw-animate-css": "^1.3.6", | ||||||
|     "typescript": "~5.8.3", |     "typescript": "~5.9.2", | ||||||
|     "typescript-eslint": "^8.35.1", |     "typescript-eslint": "^8.39.0", | ||||||
|     "vite": "^6.3.1" |     "vite": "^7.1.1" | ||||||
|   } |   } | ||||||
| } | } | ||||||
| @@ -12,6 +12,7 @@ import { | |||||||
| } from "../ui/form"; | } from "../ui/form"; | ||||||
| import { Button } from "../ui/button"; | import { Button } from "../ui/button"; | ||||||
| import { loginSchema, LoginSchema } from "@/schemas/login-schema"; | import { loginSchema, LoginSchema } from "@/schemas/login-schema"; | ||||||
|  | import z from "zod"; | ||||||
|  |  | ||||||
| interface Props { | interface Props { | ||||||
|   onSubmit: (data: LoginSchema) => void; |   onSubmit: (data: LoginSchema) => void; | ||||||
| @@ -22,6 +23,11 @@ export const LoginForm = (props: Props) => { | |||||||
|   const { onSubmit, loading } = props; |   const { onSubmit, loading } = props; | ||||||
|   const { t } = useTranslation(); |   const { t } = useTranslation(); | ||||||
|  |  | ||||||
|  |   z.config({ | ||||||
|  |     customError: (iss) => | ||||||
|  |       iss.input === undefined ? t("fieldRequired") : t("invalidInput"), | ||||||
|  |   }); | ||||||
|  |  | ||||||
|   const form = useForm<LoginSchema>({ |   const form = useForm<LoginSchema>({ | ||||||
|     resolver: zodResolver(loginSchema), |     resolver: zodResolver(loginSchema), | ||||||
|   }); |   }); | ||||||
| @@ -33,12 +39,13 @@ export const LoginForm = (props: Props) => { | |||||||
|           control={form.control} |           control={form.control} | ||||||
|           name="username" |           name="username" | ||||||
|           render={({ field }) => ( |           render={({ field }) => ( | ||||||
|             <FormItem className="mb-4"> |             <FormItem className="mb-4 gap-0"> | ||||||
|               <FormLabel>{t("loginUsername")}</FormLabel> |               <FormLabel className="mb-2">{t("loginUsername")}</FormLabel> | ||||||
|               <FormControl> |               <FormControl className="mb-1"> | ||||||
|                 <Input |                 <Input | ||||||
|                   placeholder={t("loginUsername")} |                   placeholder={t("loginUsername")} | ||||||
|                   disabled={loading} |                   disabled={loading} | ||||||
|  |                   autoComplete="username" | ||||||
|                   {...field} |                   {...field} | ||||||
|                 /> |                 /> | ||||||
|               </FormControl> |               </FormControl> | ||||||
| @@ -50,25 +57,26 @@ export const LoginForm = (props: Props) => { | |||||||
|           control={form.control} |           control={form.control} | ||||||
|           name="password" |           name="password" | ||||||
|           render={({ field }) => ( |           render={({ field }) => ( | ||||||
|             <FormItem className="mb-4"> |             <FormItem className="mb-4 gap-0"> | ||||||
|               <div className="relative"> |               <div className="relative mb-1"> | ||||||
|                 <FormLabel className="mb-2">{t("loginPassword")}</FormLabel> |                 <FormLabel className="mb-2">{t("loginPassword")}</FormLabel> | ||||||
|                 <FormControl> |                 <FormControl> | ||||||
|                   <Input |                   <Input | ||||||
|                     placeholder={t("loginPassword")} |                     placeholder={t("loginPassword")} | ||||||
|                     type="password" |                     type="password" | ||||||
|                     disabled={loading} |                     disabled={loading} | ||||||
|  |                     autoComplete="current-password" | ||||||
|                     {...field} |                     {...field} | ||||||
|                   /> |                   /> | ||||||
|                 </FormControl> |                 </FormControl> | ||||||
|                 <FormMessage /> |  | ||||||
|                 <a |                 <a | ||||||
|                   href="/forgot-password" |                   href="/forgot-password" | ||||||
|                   className="text-muted-foreground text-sm absolute right-0 bottom-10" |                   className="text-muted-foreground text-sm absolute right-0 bottom-[2.565rem]" // 2.565 is *just* perfect | ||||||
|                 > |                 > | ||||||
|                   {t("forgotPasswordTitle")} |                   {t("forgotPasswordTitle")} | ||||||
|                 </a> |                 </a> | ||||||
|               </div> |               </div> | ||||||
|  |               <FormMessage /> | ||||||
|             </FormItem> |             </FormItem> | ||||||
|           )} |           )} | ||||||
|         /> |         /> | ||||||
|   | |||||||
| @@ -8,6 +8,8 @@ import { | |||||||
| import { zodResolver } from "@hookform/resolvers/zod"; | import { zodResolver } from "@hookform/resolvers/zod"; | ||||||
| import { useForm } from "react-hook-form"; | import { useForm } from "react-hook-form"; | ||||||
| import { totpSchema, TotpSchema } from "@/schemas/totp-schema"; | import { totpSchema, TotpSchema } from "@/schemas/totp-schema"; | ||||||
|  | import { useTranslation } from "react-i18next"; | ||||||
|  | import z from "zod"; | ||||||
|  |  | ||||||
| interface Props { | interface Props { | ||||||
|   formId: string; |   formId: string; | ||||||
| @@ -17,6 +19,12 @@ interface Props { | |||||||
|  |  | ||||||
| export const TotpForm = (props: Props) => { | export const TotpForm = (props: Props) => { | ||||||
|   const { formId, onSubmit, loading } = props; |   const { formId, onSubmit, loading } = props; | ||||||
|  |   const { t } = useTranslation(); | ||||||
|  |  | ||||||
|  |   z.config({ | ||||||
|  |     customError: (iss) => | ||||||
|  |       iss.input === undefined ? t("fieldRequired") : t("invalidInput"), | ||||||
|  |   }); | ||||||
|  |  | ||||||
|   const form = useForm<TotpSchema>({ |   const form = useForm<TotpSchema>({ | ||||||
|     resolver: zodResolver(totpSchema), |     resolver: zodResolver(totpSchema), | ||||||
| @@ -31,7 +39,12 @@ export const TotpForm = (props: Props) => { | |||||||
|           render={({ field }) => ( |           render={({ field }) => ( | ||||||
|             <FormItem> |             <FormItem> | ||||||
|               <FormControl> |               <FormControl> | ||||||
|                 <InputOTP maxLength={6} disabled={loading} {...field}> |                 <InputOTP | ||||||
|  |                   maxLength={6} | ||||||
|  |                   disabled={loading} | ||||||
|  |                   {...field} | ||||||
|  |                   autoComplete="one-time-code" | ||||||
|  |                 > | ||||||
|                   <InputOTPGroup> |                   <InputOTPGroup> | ||||||
|                     <InputOTPSlot index={0} /> |                     <InputOTPSlot index={0} /> | ||||||
|                     <InputOTPSlot index={1} /> |                     <InputOTPSlot index={1} /> | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ export const AppContextProvider = ({ | |||||||
| }) => { | }) => { | ||||||
|   const { isFetching, data, error } = useSuspenseQuery({ |   const { isFetching, data, error } = useSuspenseQuery({ | ||||||
|     queryKey: ["app"], |     queryKey: ["app"], | ||||||
|     queryFn: () => axios.get("/api/app").then((res) => res.data), |     queryFn: () => axios.get("/api/context/app").then((res) => res.data), | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   if (error && !isFetching) { |   if (error && !isFetching) { | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ export const UserContextProvider = ({ | |||||||
| }) => { | }) => { | ||||||
|   const { isFetching, data, error } = useSuspenseQuery({ |   const { isFetching, data, error } = useSuspenseQuery({ | ||||||
|     queryKey: ["user"], |     queryKey: ["user"], | ||||||
|     queryFn: () => axios.get("/api/user").then((res) => res.data), |     queryFn: () => axios.get("/api/context/user").then((res) => res.data), | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   if (error && !isFetching) { |   if (error && !isFetching) { | ||||||
|   | |||||||
| @@ -136,7 +136,7 @@ h4 { | |||||||
| } | } | ||||||
|  |  | ||||||
| p { | p { | ||||||
|   @apply leading-6 [&:not(:first-child)]:mt-6; |   @apply leading-6; | ||||||
| } | } | ||||||
|  |  | ||||||
| blockquote { | blockquote { | ||||||
|   | |||||||
| @@ -27,8 +27,8 @@ export const languages = { | |||||||
|   "tr-TR": "Türkçe", |   "tr-TR": "Türkçe", | ||||||
|   "uk-UA": "Українська", |   "uk-UA": "Українська", | ||||||
|   "vi-VN": "Tiếng Việt", |   "vi-VN": "Tiếng Việt", | ||||||
|   "zh-CN": "中文", |   "zh-CN": "简体中文", | ||||||
|   "zh-TW": "中文", |   "zh-TW": "繁體中文(台灣)", | ||||||
| }; | }; | ||||||
|  |  | ||||||
| export type SupportedLanguage = keyof typeof languages; | export type SupportedLanguage = keyof typeof languages; | ||||||
|   | |||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -1,7 +1,7 @@ | |||||||
| { | { | ||||||
|     "loginTitle": "مرحبا بعودتك، قم بتسجيل الدخول باستخدام", |     "loginTitle": "مرحبا بعودتك، ادخل باستخدام", | ||||||
|     "loginTitleSimple": "Welcome back, please login", |     "loginTitleSimple": "مرحبا بعودتك، سجل دخولك", | ||||||
|     "loginDivider": "Or", |     "loginDivider": "أو", | ||||||
|     "loginUsername": "اسم المستخدم", |     "loginUsername": "اسم المستخدم", | ||||||
|     "loginPassword": "كلمة المرور", |     "loginPassword": "كلمة المرور", | ||||||
|     "loginSubmit": "تسجيل الدخول", |     "loginSubmit": "تسجيل الدخول", | ||||||
| @@ -10,8 +10,8 @@ | |||||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", |     "loginFailRateLimit": "You failed to login too many times. Please try again later", | ||||||
|     "loginSuccessTitle": "تم تسجيل الدخول", |     "loginSuccessTitle": "تم تسجيل الدخول", | ||||||
|     "loginSuccessSubtitle": "مرحبا بعودتك!", |     "loginSuccessSubtitle": "مرحبا بعودتك!", | ||||||
|     "loginOauthFailTitle": "An error occurred", |     "loginOauthFailTitle": "حدث خطأ", | ||||||
|     "loginOauthFailSubtitle": "فشل في الحصول على رابط OAuth", |     "loginOauthFailSubtitle": "أخفق الحصول على رابط OAuth", | ||||||
|     "loginOauthSuccessTitle": "إعادة توجيه", |     "loginOauthSuccessTitle": "إعادة توجيه", | ||||||
|     "loginOauthSuccessSubtitle": "إعادة توجيه إلى مزود OAuth الخاص بك", |     "loginOauthSuccessSubtitle": "إعادة توجيه إلى مزود OAuth الخاص بك", | ||||||
|     "continueRedirectingTitle": "إعادة توجيه...", |     "continueRedirectingTitle": "إعادة توجيه...", | ||||||
| @@ -19,7 +19,7 @@ | |||||||
|     "continueInvalidRedirectTitle": "إعادة توجيه غير صالحة", |     "continueInvalidRedirectTitle": "إعادة توجيه غير صالحة", | ||||||
|     "continueInvalidRedirectSubtitle": "رابط إعادة التوجيه غير صالح", |     "continueInvalidRedirectSubtitle": "رابط إعادة التوجيه غير صالح", | ||||||
|     "continueInsecureRedirectTitle": "إعادة توجيه غير آمنة", |     "continueInsecureRedirectTitle": "إعادة توجيه غير آمنة", | ||||||
|     "continueInsecureRedirectSubtitle": "You are trying to redirect from <code>https</code> to <code>http</code> which is not secure. Are you sure you want to continue?", |     "continueInsecureRedirectSubtitle": "أنت تحاول إعادة التوجيه من <code>https</code> إلى <code>http</code>، هل أنت متأكد أنك تريد المتابعة؟", | ||||||
|     "continueTitle": "متابعة", |     "continueTitle": "متابعة", | ||||||
|     "continueSubtitle": "انقر الزر للمتابعة إلى التطبيق الخاص بك.", |     "continueSubtitle": "انقر الزر للمتابعة إلى التطبيق الخاص بك.", | ||||||
|     "logoutFailTitle": "فشل تسجيل الخروج", |     "logoutFailTitle": "فشل تسجيل الخروج", | ||||||
| @@ -32,7 +32,7 @@ | |||||||
|     "notFoundTitle": "الصفحة غير موجودة", |     "notFoundTitle": "الصفحة غير موجودة", | ||||||
|     "notFoundSubtitle": "الصفحة التي تبحث عنها غير موجودة.", |     "notFoundSubtitle": "الصفحة التي تبحث عنها غير موجودة.", | ||||||
|     "notFoundButton": "انتقل إلى الرئيسية", |     "notFoundButton": "انتقل إلى الرئيسية", | ||||||
|     "totpFailTitle": "فشل في التحقق من الرمز", |     "totpFailTitle": "أخفق التحقق من الرمز", | ||||||
|     "totpFailSubtitle": "الرجاء التحقق من الرمز الخاص بك وحاول مرة أخرى", |     "totpFailSubtitle": "الرجاء التحقق من الرمز الخاص بك وحاول مرة أخرى", | ||||||
|     "totpSuccessTitle": "تم التحقق", |     "totpSuccessTitle": "تم التحقق", | ||||||
|     "totpSuccessSubtitle": "إعادة توجيه إلى تطبيقك", |     "totpSuccessSubtitle": "إعادة توجيه إلى تطبيقك", | ||||||
| @@ -42,12 +42,16 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "حاول مجددا", |     "unauthorizedButton": "حاول مجددا", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "إعادة توجيه غير موثوقة", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "أنت تحاول إعادة التوجيه إلى نطاق لا يتطابق مع النطاق المكون الخاص بك (<code>{{domain}}</code>). هل أنت متأكد من أنك تريد المتابعة؟", | ||||||
|     "cancelTitle": "إلغاء", |     "cancelTitle": "إلغاء", | ||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "نسيت كلمة المرور؟", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "حدث خطأ", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> har ikke tilladelse til at tilgå ressourcen <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> har ikke tilladelse til at tilgå ressourcen <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> har ikke tilladelse til at logge ind.", |     "unauthorizedLoginSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> har ikke tilladelse til at logge ind.", | ||||||
|     "unauthorizedGroupsSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> er ikke i de grupper, som ressourcen <code>{{resource}}</code> kræver.", |     "unauthorizedGroupsSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> er ikke i de grupper, som ressourcen <code>{{resource}}</code> kræver.", | ||||||
|  |     "unauthorizedIpSubtitle": "Din IP adresse <code>{{ip}}</code> er ikke autoriseret til at tilgå ressourcen <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Prøv igen", |     "unauthorizedButton": "Prøv igen", | ||||||
|     "untrustedRedirectTitle": "Usikker omdirigering", |     "untrustedRedirectTitle": "Usikker omdirigering", | ||||||
|     "untrustedRedirectSubtitle": "Du forsøger at omdirigere til et domæne, der ikke matcher dit konfigurerede domæne (<code>{{domain}}</code>). Er du sikker på, at du vil fortsætte?", |     "untrustedRedirectSubtitle": "Du forsøger at omdirigere til et domæne, der ikke matcher dit konfigurerede domæne (<code>{{domain}}</code>). Er du sikker på, at du vil fortsætte?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Glemt din adgangskode?", |     "forgotPasswordTitle": "Glemt din adgangskode?", | ||||||
|     "failedToFetchProvidersTitle": "Kunne ikke indlæse godkendelsesudbydere. Tjek venligst din konfiguration.", |     "failedToFetchProvidersTitle": "Kunne ikke indlæse godkendelsesudbydere. Tjek venligst din konfiguration.", | ||||||
|     "errorTitle": "Der opstod en fejl", |     "errorTitle": "Der opstod en fejl", | ||||||
|     "errorSubtitle": "Der opstod en fejl under forsøget på at udføre denne handling. Tjek venligst konsollen for mere information." |     "errorSubtitle": "Der opstod en fejl under forsøget på at udføre denne handling. Tjek venligst konsollen for mere information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -7,7 +7,7 @@ | |||||||
|     "loginSubmit": "Anmelden", |     "loginSubmit": "Anmelden", | ||||||
|     "loginFailTitle": "Login fehlgeschlagen", |     "loginFailTitle": "Login fehlgeschlagen", | ||||||
|     "loginFailSubtitle": "Bitte überprüfe deinen Benutzernamen und Passwort", |     "loginFailSubtitle": "Bitte überprüfe deinen Benutzernamen und Passwort", | ||||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", |     "loginFailRateLimit": "Zu viele fehlgeschlagene Loginversuche. Versuche es später erneut", | ||||||
|     "loginSuccessTitle": "Angemeldet", |     "loginSuccessTitle": "Angemeldet", | ||||||
|     "loginSuccessSubtitle": "Willkommen zurück!", |     "loginSuccessSubtitle": "Willkommen zurück!", | ||||||
|     "loginOauthFailTitle": "Ein Fehler ist aufgetreten", |     "loginOauthFailTitle": "Ein Fehler ist aufgetreten", | ||||||
| @@ -19,7 +19,7 @@ | |||||||
|     "continueInvalidRedirectTitle": "Ungültige Weiterleitung", |     "continueInvalidRedirectTitle": "Ungültige Weiterleitung", | ||||||
|     "continueInvalidRedirectSubtitle": "Die Weiterleitungs-URL ist ungültig", |     "continueInvalidRedirectSubtitle": "Die Weiterleitungs-URL ist ungültig", | ||||||
|     "continueInsecureRedirectTitle": "Unsichere Weiterleitung", |     "continueInsecureRedirectTitle": "Unsichere Weiterleitung", | ||||||
|     "continueInsecureRedirectSubtitle": "You are trying to redirect from <code>https</code> to <code>http</code> which is not secure. Are you sure you want to continue?", |     "continueInsecureRedirectSubtitle": "Sie versuchen von <code>https</code> auf <code>http</code> weiterzuleiten, was unsicher ist. Sind Sie sicher, dass Sie fortfahren möchten?", | ||||||
|     "continueTitle": "Weiter", |     "continueTitle": "Weiter", | ||||||
|     "continueSubtitle": "Klicken Sie auf den Button, um zur App zu gelangen.", |     "continueSubtitle": "Klicken Sie auf den Button, um zur App zu gelangen.", | ||||||
|     "logoutFailTitle": "Abmelden fehlgeschlagen", |     "logoutFailTitle": "Abmelden fehlgeschlagen", | ||||||
| @@ -27,8 +27,8 @@ | |||||||
|     "logoutSuccessTitle": "Abgemeldet", |     "logoutSuccessTitle": "Abgemeldet", | ||||||
|     "logoutSuccessSubtitle": "Sie wurden abgemeldet", |     "logoutSuccessSubtitle": "Sie wurden abgemeldet", | ||||||
|     "logoutTitle": "Abmelden", |     "logoutTitle": "Abmelden", | ||||||
|     "logoutUsernameSubtitle": "You are currently logged in as <code>{{username}}</code>. Click the button below to logout.", |     "logoutUsernameSubtitle": "Sie sind derzeit als <code>{{username}}</code> angemeldet. Klicken Sie auf den Button unten, um sich abzumelden.", | ||||||
|     "logoutOauthSubtitle": "You are currently logged in as <code>{{username}}</code> using the {{provider}} OAuth provider. Click the button below to logout.", |     "logoutOauthSubtitle": "Sie sind derzeit als <code>{{username}}</code> über den OAuth-Anbieter {{provider}} angemeldet. Klicken Sie auf den Button unten, um sich abzumelden.", | ||||||
|     "notFoundTitle": "Seite nicht gefunden", |     "notFoundTitle": "Seite nicht gefunden", | ||||||
|     "notFoundSubtitle": "Die gesuchte Seite existiert nicht.", |     "notFoundSubtitle": "Die gesuchte Seite existiert nicht.", | ||||||
|     "notFoundButton": "Nach Hause", |     "notFoundButton": "Nach Hause", | ||||||
| @@ -37,17 +37,21 @@ | |||||||
|     "totpSuccessTitle": "Verifiziert", |     "totpSuccessTitle": "Verifiziert", | ||||||
|     "totpSuccessSubtitle": "Leite zur App weiter", |     "totpSuccessSubtitle": "Leite zur App weiter", | ||||||
|     "totpTitle": "Geben Sie Ihren TOTP Code ein", |     "totpTitle": "Geben Sie Ihren TOTP Code ein", | ||||||
|     "totpSubtitle": "Please enter the code from your authenticator app.", |     "totpSubtitle": "Bitte geben Sie den Code aus Ihrer Authenticator-App ein.", | ||||||
|     "unauthorizedTitle": "Unautorisiert", |     "unauthorizedTitle": "Unautorisiert", | ||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "Der Benutzer mit Benutzername <code>{{username}}</code> ist nicht berechtigt, auf die Ressource <code>{{resource}}</code> zuzugreifen.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "Der Benutzer mit Benutzername <code>{{username}}</code> ist nicht berechtigt, sich anzumelden.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "Der Benutzer mit Benutzername <code>{{username}}</code> ist nicht in den Gruppen, die von der Ressource <code>{{resource}}</code> benötigt werden.", | ||||||
|  |     "unauthorizedIpSubtitle": "Ihre IP-Adresse <code>{{ip}}</code> ist nicht berechtigt, auf die Ressource <code>{{resource}}</code> zuzugreifen.", | ||||||
|     "unauthorizedButton": "Erneut versuchen", |     "unauthorizedButton": "Erneut versuchen", | ||||||
|     "untrustedRedirectTitle": "Nicht vertrauenswürdige Weiterleitung", |     "untrustedRedirectTitle": "Nicht vertrauenswürdige Weiterleitung", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "Sie versuchen auf eine Domain umzuleiten, die nicht mit Ihrer konfigurierten Domain übereinstimmt (<code>{{domain}}</code>). Sind Sie sicher, dass Sie fortfahren möchten?", | ||||||
|     "cancelTitle": "Abbrechen", |     "cancelTitle": "Abbrechen", | ||||||
|     "forgotPasswordTitle": "Passwort vergessen?", |     "forgotPasswordTitle": "Passwort vergessen?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Fehler beim Laden der Authentifizierungsanbieter. Bitte überprüfen Sie Ihre Konfiguration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "Ein Fehler ist aufgetreten", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "Beim Versuch, diese Aktion auszuführen, ist ein Fehler aufgetreten. Bitte überprüfen Sie die Konsole für weitere Informationen.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν έχει άδεια πρόσβασης στον πόρο <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν έχει άδεια πρόσβασης στον πόρο <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν είναι εξουσιοδοτημένος να συνδεθεί.", |     "unauthorizedLoginSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν είναι εξουσιοδοτημένος να συνδεθεί.", | ||||||
|     "unauthorizedGroupsSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν είναι στις ομάδες που απαιτούνται από τον πόρο <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν είναι στις ομάδες που απαιτούνται από τον πόρο <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Η διεύθυνση IP σας <code>{{ip}}</code> δεν είναι εξουσιοδοτημένη να έχει πρόσβαση στον πόρο <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Προσπαθήστε ξανά", |     "unauthorizedButton": "Προσπαθήστε ξανά", | ||||||
|     "untrustedRedirectTitle": "Μη έμπιστη ανακατεύθυνση", |     "untrustedRedirectTitle": "Μη έμπιστη ανακατεύθυνση", | ||||||
|     "untrustedRedirectSubtitle": "Προσπαθείτε να ανακατευθύνετε σε ένα domain που δεν ταιριάζει με τον ρυθμισμένο domain σας (<code>{{domain}}</code>). Είστε βέβαιοι ότι θέλετε να συνεχίσετε;", |     "untrustedRedirectSubtitle": "Προσπαθείτε να ανακατευθύνετε σε ένα domain που δεν ταιριάζει με τον ρυθμισμένο domain σας (<code>{{domain}}</code>). Είστε βέβαιοι ότι θέλετε να συνεχίσετε;", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Ξεχάσατε το συνθηματικό σας;", |     "forgotPasswordTitle": "Ξεχάσατε το συνθηματικό σας;", | ||||||
|     "failedToFetchProvidersTitle": "Αποτυχία φόρτωσης παρόχων πιστοποίησης. Παρακαλώ ελέγξτε τις ρυθμίσεις σας.", |     "failedToFetchProvidersTitle": "Αποτυχία φόρτωσης παρόχων πιστοποίησης. Παρακαλώ ελέγξτε τις ρυθμίσεις σας.", | ||||||
|     "errorTitle": "Παρουσιάστηκε ένα σφάλμα", |     "errorTitle": "Παρουσιάστηκε ένα σφάλμα", | ||||||
|     "errorSubtitle": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια εκτέλεσης αυτής της ενέργειας. Ελέγξτε την κονσόλα για περισσότερες πληροφορίες." |     "errorSubtitle": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια εκτέλεσης αυτής της ενέργειας. Ελέγξτε την κονσόλα για περισσότερες πληροφορίες.", | ||||||
|  |     "forgotPasswordMessage": "Μπορείτε να επαναφέρετε τον κωδικό πρόσβασής σας αλλάζοντας τη μεταβλητή περιβάλλοντος `USERS`.", | ||||||
|  |     "fieldRequired": "Αυτό το πεδίο είναι υποχρεωτικό", | ||||||
|  |     "invalidInput": "Μη έγκυρη καταχώρηση" | ||||||
| } | } | ||||||
| @@ -50,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -50,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -1,53 +1,57 @@ | |||||||
| { | { | ||||||
|     "loginTitle": "Bienvenido de nuevo, inicie sesión con", |     "loginTitle": "Bienvenido de vuelta, inicie sesión con", | ||||||
|     "loginTitleSimple": "Welcome back, please login", |     "loginTitleSimple": "Bienvenido de vuelta, por favor inicie sesión", | ||||||
|     "loginDivider": "Or", |     "loginDivider": "O", | ||||||
|     "loginUsername": "Username", |     "loginUsername": "Usuario", | ||||||
|     "loginPassword": "Password", |     "loginPassword": "Contraseña", | ||||||
|     "loginSubmit": "Login", |     "loginSubmit": "Iniciar sesión", | ||||||
|     "loginFailTitle": "Failed to log in", |     "loginFailTitle": "Fallo al iniciar sesión", | ||||||
|     "loginFailSubtitle": "Please check your username and password", |     "loginFailSubtitle": "Por favor revise su usuario y contraseña", | ||||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", |     "loginFailRateLimit": "Muchos inicios de sesión consecutivos fallidos. Por favor inténtelo más tarde", | ||||||
|     "loginSuccessTitle": "Logged in", |     "loginSuccessTitle": "Sesión iniciada", | ||||||
|     "loginSuccessSubtitle": "Welcome back!", |     "loginSuccessSubtitle": "¡Bienvenido de vuelta!", | ||||||
|     "loginOauthFailTitle": "An error occurred", |     "loginOauthFailTitle": "Ocurrió un error", | ||||||
|     "loginOauthFailSubtitle": "Error al obtener la URL de OAuth", |     "loginOauthFailSubtitle": "Error al obtener la URL de OAuth", | ||||||
|     "loginOauthSuccessTitle": "Redirecting", |     "loginOauthSuccessTitle": "Redireccionando", | ||||||
|     "loginOauthSuccessSubtitle": "Redirecting to your OAuth provider", |     "loginOauthSuccessSubtitle": "Redireccionando a tu proveedor de OAuth", | ||||||
|     "continueRedirectingTitle": "Redirecting...", |     "continueRedirectingTitle": "Redireccionando...", | ||||||
|     "continueRedirectingSubtitle": "You should be redirected to the app soon", |     "continueRedirectingSubtitle": "Pronto será redirigido a la aplicación", | ||||||
|     "continueInvalidRedirectTitle": "Invalid redirect", |     "continueInvalidRedirectTitle": "Redirección inválida", | ||||||
|     "continueInvalidRedirectSubtitle": "The redirect URL is invalid", |     "continueInvalidRedirectSubtitle": "La URL de redirección es inválida", | ||||||
|     "continueInsecureRedirectTitle": "Insecure redirect", |     "continueInsecureRedirectTitle": "Redirección insegura", | ||||||
|     "continueInsecureRedirectSubtitle": "You are trying to redirect from <code>https</code> to <code>http</code> which is not secure. Are you sure you want to continue?", |     "continueInsecureRedirectSubtitle": "Está intentando redirigir desde <code>https</code> a <code>http</code> lo cual no es seguro. ¿Está seguro que desea continuar?", | ||||||
|     "continueTitle": "Continue", |     "continueTitle": "Continuar", | ||||||
|     "continueSubtitle": "Click the button to continue to your app.", |     "continueSubtitle": "Haga clic en el botón para continuar hacia su aplicación.", | ||||||
|     "logoutFailTitle": "Failed to log out", |     "logoutFailTitle": "Fallo al cerrar sesión", | ||||||
|     "logoutFailSubtitle": "Please try again", |     "logoutFailSubtitle": "Por favor intente nuevamente", | ||||||
|     "logoutSuccessTitle": "Logged out", |     "logoutSuccessTitle": "Sesión cerrada", | ||||||
|     "logoutSuccessSubtitle": "You have been logged out", |     "logoutSuccessSubtitle": "Su sesión ha sido cerrada", | ||||||
|     "logoutTitle": "Logout", |     "logoutTitle": "Cerrar sesión", | ||||||
|     "logoutUsernameSubtitle": "You are currently logged in as <code>{{username}}</code>. Click the button below to logout.", |     "logoutUsernameSubtitle": "Actualmente está conectado como <code>{{username}}</code>. Haga clic en el botón de abajo para cerrar sesión.", | ||||||
|     "logoutOauthSubtitle": "You are currently logged in as <code>{{username}}</code> using the {{provider}} OAuth provider. Click the button below to logout.", |     "logoutOauthSubtitle": "Actualmente está conectado como <code>{{username}}</code> usando {{provider}} como su proveedor de OAuth. Haga clic en el botón de abajo para cerrar sesión.", | ||||||
|     "notFoundTitle": "Page not found", |     "notFoundTitle": "Página no encontrada", | ||||||
|     "notFoundSubtitle": "The page you are looking for does not exist.", |     "notFoundSubtitle": "La página que está buscando no existe.", | ||||||
|     "notFoundButton": "Go home", |     "notFoundButton": "Volver al inicio", | ||||||
|     "totpFailTitle": "Failed to verify code", |     "totpFailTitle": "Error al verificar código", | ||||||
|     "totpFailSubtitle": "Please check your code and try again", |     "totpFailSubtitle": "Por favor compruebe su código e inténtelo de nuevo", | ||||||
|     "totpSuccessTitle": "Verified", |     "totpSuccessTitle": "Verificado", | ||||||
|     "totpSuccessSubtitle": "Redirecting to your app", |     "totpSuccessSubtitle": "Redirigiendo a su aplicación", | ||||||
|     "totpTitle": "Enter your TOTP code", |     "totpTitle": "Ingrese su código TOTP", | ||||||
|     "totpSubtitle": "Please enter the code from your authenticator app.", |     "totpSubtitle": "Por favor introduzca el código de su aplicación de autenticación.", | ||||||
|     "unauthorizedTitle": "Unauthorized", |     "unauthorizedTitle": "No autorizado", | ||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "El usuario con nombre de usuario <code>{{username}}</code> no está autorizado para acceder al recurso <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "El usuario con nombre de usuario <code>{{username}}</code> no está autorizado a iniciar sesión.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "El usuario con nombre de usuario <code>{{username}}</code> no está en los grupos requeridos por el recurso <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "unauthorizedButton": "Inténtelo de nuevo", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectTitle": "Redirección no confiable", | ||||||
|     "cancelTitle": "Cancel", |     "untrustedRedirectSubtitle": "Está intentando redirigir a un dominio que no coincide con su dominio configurado (<code>{{domain}}</code>). ¿Está seguro que desea continuar?", | ||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "cancelTitle": "Cancelar", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "forgotPasswordTitle": "¿Olvidó su contraseña?", | ||||||
|     "errorTitle": "An error occurred", |     "failedToFetchProvidersTitle": "Error al cargar los proveedores de autenticación. Por favor revise su configuración.", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorTitle": "Ha ocurrido un error", | ||||||
|  |     "errorSubtitle": "Ocurrió un error mientras se trataba de realizar esta acción. Por favor, revise la consola para más información.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -1,16 +1,16 @@ | |||||||
| { | { | ||||||
|     "loginTitle": "Bienvenue, connectez-vous avec", |     "loginTitle": "Bienvenue, connectez-vous avec", | ||||||
|     "loginTitleSimple": "Welcome back, please login", |     "loginTitleSimple": "De retour parmi nous, veuillez vous connecter", | ||||||
|     "loginDivider": "Or", |     "loginDivider": "Ou", | ||||||
|     "loginUsername": "Nom d'utilisateur", |     "loginUsername": "Nom d'utilisateur", | ||||||
|     "loginPassword": "Mot de passe", |     "loginPassword": "Mot de passe", | ||||||
|     "loginSubmit": "Se connecter", |     "loginSubmit": "Se connecter", | ||||||
|     "loginFailTitle": "Échec de la connexion", |     "loginFailTitle": "Échec de la connexion", | ||||||
|     "loginFailSubtitle": "Veuillez vérifier votre nom d'utilisateur et votre mot de passe", |     "loginFailSubtitle": "Veuillez vérifier votre nom d'utilisateur et votre mot de passe", | ||||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", |     "loginFailRateLimit": "Vous avez échoué trop de fois à vous connecter. Veuillez réessayer ultérieurement", | ||||||
|     "loginSuccessTitle": "Connecté", |     "loginSuccessTitle": "Connecté", | ||||||
|     "loginSuccessSubtitle": "Bienvenue!", |     "loginSuccessSubtitle": "Bienvenue !", | ||||||
|     "loginOauthFailTitle": "An error occurred", |     "loginOauthFailTitle": "Une erreur s'est produite", | ||||||
|     "loginOauthFailSubtitle": "Impossible d'obtenir l'URL OAuth", |     "loginOauthFailSubtitle": "Impossible d'obtenir l'URL OAuth", | ||||||
|     "loginOauthSuccessTitle": "Redirection", |     "loginOauthSuccessTitle": "Redirection", | ||||||
|     "loginOauthSuccessSubtitle": "Redirection vers votre fournisseur OAuth", |     "loginOauthSuccessSubtitle": "Redirection vers votre fournisseur OAuth", | ||||||
| @@ -19,7 +19,7 @@ | |||||||
|     "continueInvalidRedirectTitle": "Redirection invalide", |     "continueInvalidRedirectTitle": "Redirection invalide", | ||||||
|     "continueInvalidRedirectSubtitle": "L'URL de redirection est invalide", |     "continueInvalidRedirectSubtitle": "L'URL de redirection est invalide", | ||||||
|     "continueInsecureRedirectTitle": "Redirection non sécurisée", |     "continueInsecureRedirectTitle": "Redirection non sécurisée", | ||||||
|     "continueInsecureRedirectSubtitle": "You are trying to redirect from <code>https</code> to <code>http</code> which is not secure. Are you sure you want to continue?", |     "continueInsecureRedirectSubtitle": "Vous tentez de rediriger de <code>https</code> vers <code>http</code>, ce qui n'est pas sécurisé. Êtes-vous sûr de vouloir continuer ?", | ||||||
|     "continueTitle": "Continuer", |     "continueTitle": "Continuer", | ||||||
|     "continueSubtitle": "Cliquez sur le bouton pour continuer vers votre application.", |     "continueSubtitle": "Cliquez sur le bouton pour continuer vers votre application.", | ||||||
|     "logoutFailTitle": "Échec de la déconnexion", |     "logoutFailTitle": "Échec de la déconnexion", | ||||||
| @@ -27,8 +27,8 @@ | |||||||
|     "logoutSuccessTitle": "Déconnecté", |     "logoutSuccessTitle": "Déconnecté", | ||||||
|     "logoutSuccessSubtitle": "Vous avez été déconnecté", |     "logoutSuccessSubtitle": "Vous avez été déconnecté", | ||||||
|     "logoutTitle": "Déconnexion", |     "logoutTitle": "Déconnexion", | ||||||
|     "logoutUsernameSubtitle": "You are currently logged in as <code>{{username}}</code>. Click the button below to logout.", |     "logoutUsernameSubtitle": "Vous êtes actuellement connecté en tant que <code>{{username}}</code>. Cliquez sur le bouton ci-dessous pour vous déconnecter.", | ||||||
|     "logoutOauthSubtitle": "You are currently logged in as <code>{{username}}</code> using the {{provider}} OAuth provider. Click the button below to logout.", |     "logoutOauthSubtitle": "Vous êtes actuellement connecté en tant que <code>{{username}}</code> via le fournisseur OAuth {{provider}}. Cliquez sur le bouton ci-dessous pour vous déconnecter.", | ||||||
|     "notFoundTitle": "Page introuvable", |     "notFoundTitle": "Page introuvable", | ||||||
|     "notFoundSubtitle": "La page recherchée n'existe pas.", |     "notFoundSubtitle": "La page recherchée n'existe pas.", | ||||||
|     "notFoundButton": "Retour à la page d'accueil", |     "notFoundButton": "Retour à la page d'accueil", | ||||||
| @@ -37,17 +37,21 @@ | |||||||
|     "totpSuccessTitle": "Vérifié", |     "totpSuccessTitle": "Vérifié", | ||||||
|     "totpSuccessSubtitle": "Redirection vers votre application", |     "totpSuccessSubtitle": "Redirection vers votre application", | ||||||
|     "totpTitle": "Saisissez votre code TOTP", |     "totpTitle": "Saisissez votre code TOTP", | ||||||
|     "totpSubtitle": "Please enter the code from your authenticator app.", |     "totpSubtitle": "Veuillez saisir le code de votre application d'authentification.", | ||||||
|     "unauthorizedTitle": "Non autorisé", |     "unauthorizedTitle": "Unauthorized", | ||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "L'utilisateur avec le nom d'utilisateur <code>{{username}}</code> n'est pas autorisé à accéder à la ressource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "L'utilisateur avec le nom d'utilisateur <code>{{username}}</code> n'est pas autorisé à se connecter.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "L'utilisateur avec le nom d'utilisateur <code>{{username}}</code> n'appartient pas aux groupes requis par la ressource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Votre adresse IP <code>{{ip}}</code> n'est pas autorisée à accéder à la ressource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Réessayer", |     "unauthorizedButton": "Réessayer", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Redirection non fiable", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "Vous tentez de rediriger vers un domaine qui ne correspond pas à votre domaine configuré (<code>{{domain}}</code>). Êtes-vous sûr de vouloir continuer ?", | ||||||
|     "cancelTitle": "Cancel", |     "cancelTitle": "Annuler", | ||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Mot de passe oublié ?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Échec du chargement des fournisseurs d'authentification. Veuillez vérifier votre configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "Une erreur est survenue", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "Une erreur est survenue lors de l'exécution de cette action. Veuillez consulter la console pour plus d'informations.", | ||||||
|  |     "forgotPasswordMessage": "Vous pouvez réinitialiser votre mot de passe en modifiant la variable d'environnement `USERS`.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Opnieuw proberen", |     "unauthorizedButton": "Opnieuw proberen", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -1,7 +1,7 @@ | |||||||
| { | { | ||||||
|     "loginTitle": "Witaj ponownie, zaloguj się przez", |     "loginTitle": "Witaj ponownie, zaloguj się przez", | ||||||
|     "loginTitleSimple": "Witaj ponownie, zaloguj się", |     "loginTitleSimple": "Witaj ponownie, zaloguj się", | ||||||
|     "loginDivider": "lub", |     "loginDivider": "Lub", | ||||||
|     "loginUsername": "Nazwa użytkownika", |     "loginUsername": "Nazwa użytkownika", | ||||||
|     "loginPassword": "Hasło", |     "loginPassword": "Hasło", | ||||||
|     "loginSubmit": "Zaloguj się", |     "loginSubmit": "Zaloguj się", | ||||||
| @@ -26,7 +26,7 @@ | |||||||
|     "logoutFailSubtitle": "Spróbuj ponownie", |     "logoutFailSubtitle": "Spróbuj ponownie", | ||||||
|     "logoutSuccessTitle": "Wylogowano", |     "logoutSuccessTitle": "Wylogowano", | ||||||
|     "logoutSuccessSubtitle": "Zostałeś wylogowany", |     "logoutSuccessSubtitle": "Zostałeś wylogowany", | ||||||
|     "logoutTitle": "Wylogowanie", |     "logoutTitle": "Wyloguj się", | ||||||
|     "logoutUsernameSubtitle": "Jesteś obecnie zalogowany jako <code>{{username}}</code>. Kliknij poniższy przycisk, aby się wylogować.", |     "logoutUsernameSubtitle": "Jesteś obecnie zalogowany jako <code>{{username}}</code>. Kliknij poniższy przycisk, aby się wylogować.", | ||||||
|     "logoutOauthSubtitle": "Obecnie jesteś zalogowany jako <code>{{username}}</code> przy użyciu dostawcy {{provider}} OAuth. Kliknij poniższy przycisk, aby się wylogować.", |     "logoutOauthSubtitle": "Obecnie jesteś zalogowany jako <code>{{username}}</code> przy użyciu dostawcy {{provider}} OAuth. Kliknij poniższy przycisk, aby się wylogować.", | ||||||
|     "notFoundTitle": "Nie znaleziono strony", |     "notFoundTitle": "Nie znaleziono strony", | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "Użytkownik o nazwie użytkownika <code>{{username}}</code> nie ma uprawnień dostępu do zasobu <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "Użytkownik o nazwie użytkownika <code>{{username}}</code> nie ma uprawnień dostępu do zasobu <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "Użytkownik o nazwie <code>{{username}}</code> nie jest upoważniony do zalogowania się.", |     "unauthorizedLoginSubtitle": "Użytkownik o nazwie <code>{{username}}</code> nie jest upoważniony do zalogowania się.", | ||||||
|     "unauthorizedGroupsSubtitle": "Użytkownik o nazwie <code>{{username}}</code> nie należy do grup wymaganych przez zasób <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "Użytkownik o nazwie <code>{{username}}</code> nie należy do grup wymaganych przez zasób <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Twój adres IP <code>{{ip}}</code> nie ma autoryzacji do dostępu do zasobu <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Spróbuj ponownie", |     "unauthorizedButton": "Spróbuj ponownie", | ||||||
|     "untrustedRedirectTitle": "Niezaufane przekierowanie", |     "untrustedRedirectTitle": "Niezaufane przekierowanie", | ||||||
|     "untrustedRedirectSubtitle": "Próbujesz przekierować do domeny, która nie pasuje do Twojej skonfigurowanej domeny (<code>{{domain}}</code>). Czy na pewno chcesz kontynuować?", |     "untrustedRedirectSubtitle": "Próbujesz przekierować do domeny, która nie pasuje do Twojej skonfigurowanej domeny (<code>{{domain}}</code>). Czy na pewno chcesz kontynuować?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Nie pamiętasz hasła?", |     "forgotPasswordTitle": "Nie pamiętasz hasła?", | ||||||
|     "failedToFetchProvidersTitle": "Nie udało się załadować dostawców uwierzytelniania. Sprawdź swoją konfigurację.", |     "failedToFetchProvidersTitle": "Nie udało się załadować dostawców uwierzytelniania. Sprawdź swoją konfigurację.", | ||||||
|     "errorTitle": "Wystąpił błąd", |     "errorTitle": "Wystąpił błąd", | ||||||
|     "errorSubtitle": "Wystąpił błąd podczas próby wykonania tej czynności. Sprawdź konsolę, aby uzyskać więcej informacji." |     "errorSubtitle": "Wystąpił błąd podczas próby wykonania tej czynności. Sprawdź konsolę, aby uzyskać więcej informacji.", | ||||||
|  |     "forgotPasswordMessage": "Możesz zresetować hasło, zmieniając zmienną środowiskową `USERS`.", | ||||||
|  |     "fieldRequired": "To pole jest wymagane", | ||||||
|  |     "invalidInput": "Nieprawidłowe dane wejściowe" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Tentar novamente", |     "unauthorizedButton": "Tentar novamente", | ||||||
|     "untrustedRedirectTitle": "Redirecionamento não confiável", |     "untrustedRedirectTitle": "Redirecionamento não confiável", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Esqueceu sua senha?", |     "forgotPasswordTitle": "Esqueceu sua senha?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "Пользователю <code>{{username}}</code> не разрешен доступ к <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "Пользователю <code>{{username}}</code> не разрешен доступ к <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "Пользователю <code>{{username}}</code> не разрешен вход.", |     "unauthorizedLoginSubtitle": "Пользователю <code>{{username}}</code> не разрешен вход.", | ||||||
|     "unauthorizedGroupsSubtitle": "Пользователь <code>{{username}}</code> не состоит в группах, которым разрешен доступ к <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "Пользователь <code>{{username}}</code> не состоит в группах, которым разрешен доступ к <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Ваш IP адрес <code>{{ip}}</code> не авторизован для доступа к ресурсу <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Повторить", |     "unauthorizedButton": "Повторить", | ||||||
|     "untrustedRedirectTitle": "Ненадежное перенаправление", |     "untrustedRedirectTitle": "Ненадежное перенаправление", | ||||||
|     "untrustedRedirectSubtitle": "Попытка перенаправить на домен, который не соответствует вашему заданному домену (<code>{{domain}}</code>). Уверены, что хотите продолжить?", |     "untrustedRedirectSubtitle": "Попытка перенаправить на домен, который не соответствует вашему заданному домену (<code>{{domain}}</code>). Уверены, что хотите продолжить?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Забыли пароль?", |     "forgotPasswordTitle": "Забыли пароль?", | ||||||
|     "failedToFetchProvidersTitle": "Не удалось загрузить провайдеров аутентификации. Пожалуйста, проверьте конфигурацию.", |     "failedToFetchProvidersTitle": "Не удалось загрузить провайдеров аутентификации. Пожалуйста, проверьте конфигурацию.", | ||||||
|     "errorTitle": "Произошла ошибка", |     "errorTitle": "Произошла ошибка", | ||||||
|     "errorSubtitle": "Произошла ошибка при попытке выполнить это действие. Проверьте консоль для дополнительной информации." |     "errorSubtitle": "Произошла ошибка при попытке выполнить это действие. Проверьте консоль для дополнительной информации.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -1,53 +1,57 @@ | |||||||
| { | { | ||||||
|     "loginTitle": "Welcome back, login with", |     "loginTitle": "Добродошли назад, пријавите се са", | ||||||
|     "loginTitleSimple": "Welcome back, please login", |     "loginTitleSimple": "Добродошли назад, молим вас пријавите се", | ||||||
|     "loginDivider": "Or", |     "loginDivider": "Или", | ||||||
|     "loginUsername": "Username", |     "loginUsername": "Корисничко име", | ||||||
|     "loginPassword": "Password", |     "loginPassword": "Лозинка", | ||||||
|     "loginSubmit": "Login", |     "loginSubmit": "Пријава", | ||||||
|     "loginFailTitle": "Failed to log in", |     "loginFailTitle": "Неуспешна пријава", | ||||||
|     "loginFailSubtitle": "Please check your username and password", |     "loginFailSubtitle": "Молим вас проверите ваше корисничко име и лозинку", | ||||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", |     "loginFailRateLimit": "Нисте успели да се пријавите превише пута. Молим вас покушајте касније", | ||||||
|     "loginSuccessTitle": "Logged in", |     "loginSuccessTitle": "Пријављени", | ||||||
|     "loginSuccessSubtitle": "Welcome back!", |     "loginSuccessSubtitle": "Добродошли назад!", | ||||||
|     "loginOauthFailTitle": "An error occurred", |     "loginOauthFailTitle": "Појавила се грешка", | ||||||
|     "loginOauthFailSubtitle": "Failed to get OAuth URL", |     "loginOauthFailSubtitle": "Неуспело преузимање OAuth адресе", | ||||||
|     "loginOauthSuccessTitle": "Redirecting", |     "loginOauthSuccessTitle": "Преусмеравање", | ||||||
|     "loginOauthSuccessSubtitle": "Redirecting to your OAuth provider", |     "loginOauthSuccessSubtitle": "Преусмеравање на вашег OAuth провајдера", | ||||||
|     "continueRedirectingTitle": "Redirecting...", |     "continueRedirectingTitle": "Преусмеравање...", | ||||||
|     "continueRedirectingSubtitle": "You should be redirected to the app soon", |     "continueRedirectingSubtitle": "Требали би сте ускоро да будете преусмерени на апликацију", | ||||||
|     "continueInvalidRedirectTitle": "Invalid redirect", |     "continueInvalidRedirectTitle": "Неисправно преусмеравање", | ||||||
|     "continueInvalidRedirectSubtitle": "The redirect URL is invalid", |     "continueInvalidRedirectSubtitle": "Адреса за преусмеравање није исправна", | ||||||
|     "continueInsecureRedirectTitle": "Insecure redirect", |     "continueInsecureRedirectTitle": "Небезбедно преусмеравање", | ||||||
|     "continueInsecureRedirectSubtitle": "You are trying to redirect from <code>https</code> to <code>http</code> which is not secure. Are you sure you want to continue?", |     "continueInsecureRedirectSubtitle": "Покушавате да преусмерите са <code>https</code> на <code>http</code> што није безбедно. Да ли желите да наставите?", | ||||||
|     "continueTitle": "Continue", |     "continueTitle": "Настави", | ||||||
|     "continueSubtitle": "Click the button to continue to your app.", |     "continueSubtitle": "Кликните на дугме да би сте наставили на нашу апликацију.", | ||||||
|     "logoutFailTitle": "Failed to log out", |     "logoutFailTitle": "Неуспешно одјављивање", | ||||||
|     "logoutFailSubtitle": "Please try again", |     "logoutFailSubtitle": "Молим вас покушајте поново", | ||||||
|     "logoutSuccessTitle": "Logged out", |     "logoutSuccessTitle": "Одјављени", | ||||||
|     "logoutSuccessSubtitle": "You have been logged out", |     "logoutSuccessSubtitle": "Одјављени сте", | ||||||
|     "logoutTitle": "Logout", |     "logoutTitle": "Одјава", | ||||||
|     "logoutUsernameSubtitle": "You are currently logged in as <code>{{username}}</code>. Click the button below to logout.", |     "logoutUsernameSubtitle": "Тренутно сте пријављени као <code>{{username}}</code>. Кликните на дугме испод да се одјавите.", | ||||||
|     "logoutOauthSubtitle": "You are currently logged in as <code>{{username}}</code> using the {{provider}} OAuth provider. Click the button below to logout.", |     "logoutOauthSubtitle": "Тренутно сте пријављени као <code>{{username}}</code> користећи {{provider}} OAuth провајдера. Кликните на дугме испод да се одјавите.", | ||||||
|     "notFoundTitle": "Page not found", |     "notFoundTitle": "Страница није пронађена", | ||||||
|     "notFoundSubtitle": "The page you are looking for does not exist.", |     "notFoundSubtitle": "Страница коју тражите не постоји.", | ||||||
|     "notFoundButton": "Go home", |     "notFoundButton": "На почетак", | ||||||
|     "totpFailTitle": "Failed to verify code", |     "totpFailTitle": "Неуспело потврђивање кода", | ||||||
|     "totpFailSubtitle": "Please check your code and try again", |     "totpFailSubtitle": "Молим вас проверите ваш код и покушајте поново", | ||||||
|     "totpSuccessTitle": "Verified", |     "totpSuccessTitle": "Потврђен", | ||||||
|     "totpSuccessSubtitle": "Redirecting to your app", |     "totpSuccessSubtitle": "Преусмеравање на вашу апликацију", | ||||||
|     "totpTitle": "Enter your TOTP code", |     "totpTitle": "Унесите ваш TOTP код", | ||||||
|     "totpSubtitle": "Please enter the code from your authenticator app.", |     "totpSubtitle": "Молим вас унесите код из ваше апликације за аутентификацију.", | ||||||
|     "unauthorizedTitle": "Unauthorized", |     "unauthorizedTitle": "Неауторизован", | ||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "Корисник са корисничким именом <code>{{username}}</code> није ауторизован да приступи ресурсу <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "Корисник са корисничким именом <code>{{username}}</code> није ауторизован за пријављивање.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "Корисник са корисничким именом <code>{{username}}</code> није у групама које захтева ресурс <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedIpSubtitle": "Ваша IP адреса <code>{{ip}}</code> није ауторизована да приступи ресурсу <code>{{resource}}</code>.", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "unauthorizedButton": "Покушајте поново", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectTitle": "Преусмерење без поверења", | ||||||
|     "cancelTitle": "Cancel", |     "untrustedRedirectSubtitle": "Покушавате да преусмерите на домен који се не поклапа са подешеним доменом (<code>{{domain}}</code>). Да ли желите да наставите?", | ||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "cancelTitle": "Поништи", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "forgotPasswordTitle": "Заборавили сте лозинку?", | ||||||
|     "errorTitle": "An error occurred", |     "failedToFetchProvidersTitle": "Није успело учитавање провајдера аутентификације. Молим вас проверите ваша подешавања.", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorTitle": "Појавила се грешка", | ||||||
|  |     "errorSubtitle": "Појавила се грешка при покушају извршавања ове радње. Молим вас проверите конзолу за додатне информације.", | ||||||
|  |     "forgotPasswordMessage": "Можете поништити вашу лозинку променом `USERS` променљиве окружења.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -42,6 +42,7 @@ | |||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedButton": "Try again", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "Untrusted redirect", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", | ||||||
| @@ -49,5 +50,8 @@ | |||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "Forgot your password?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "An error occurred", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information.", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -1,16 +1,16 @@ | |||||||
| { | { | ||||||
|     "loginTitle": "欢迎回来,请登录", |     "loginTitle": "欢迎回来,请使用以下方式登录", | ||||||
|     "loginTitleSimple": "Welcome back, please login", |     "loginTitleSimple": "欢迎回来,请登录", | ||||||
|     "loginDivider": "或", |     "loginDivider": "或", | ||||||
|     "loginUsername": "用户名", |     "loginUsername": "用户名", | ||||||
|     "loginPassword": "密码", |     "loginPassword": "密码", | ||||||
|     "loginSubmit": "登录", |     "loginSubmit": "登录", | ||||||
|     "loginFailTitle": "登录失败", |     "loginFailTitle": "登录失败", | ||||||
|     "loginFailSubtitle": "请检查您的用户名和密码", |     "loginFailSubtitle": "请检查您的用户名和密码", | ||||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", |     "loginFailRateLimit": "您登录失败次数过多。请稍后再试", | ||||||
|     "loginSuccessTitle": "已登录", |     "loginSuccessTitle": "已登录", | ||||||
|     "loginSuccessSubtitle": "欢迎回来!", |     "loginSuccessSubtitle": "欢迎回来!", | ||||||
|     "loginOauthFailTitle": "An error occurred", |     "loginOauthFailTitle": "发生错误", | ||||||
|     "loginOauthFailSubtitle": "获取 OAuth URL 失败", |     "loginOauthFailSubtitle": "获取 OAuth URL 失败", | ||||||
|     "loginOauthSuccessTitle": "重定向中", |     "loginOauthSuccessTitle": "重定向中", | ||||||
|     "loginOauthSuccessSubtitle": "重定向到您的 OAuth 提供商", |     "loginOauthSuccessSubtitle": "重定向到您的 OAuth 提供商", | ||||||
| @@ -19,7 +19,7 @@ | |||||||
|     "continueInvalidRedirectTitle": "无效的重定向", |     "continueInvalidRedirectTitle": "无效的重定向", | ||||||
|     "continueInvalidRedirectSubtitle": "重定向URL无效", |     "continueInvalidRedirectSubtitle": "重定向URL无效", | ||||||
|     "continueInsecureRedirectTitle": "不安全的重定向", |     "continueInsecureRedirectTitle": "不安全的重定向", | ||||||
|     "continueInsecureRedirectSubtitle": "You are trying to redirect from <code>https</code> to <code>http</code> which is not secure. Are you sure you want to continue?", |     "continueInsecureRedirectSubtitle": "您正在尝试从<code>https</code>重定向到<code>http</code>可能存在风险。您确定要继续吗?", | ||||||
|     "continueTitle": "继续", |     "continueTitle": "继续", | ||||||
|     "continueSubtitle": "点击按钮以继续您的应用。", |     "continueSubtitle": "点击按钮以继续您的应用。", | ||||||
|     "logoutFailTitle": "注销失败", |     "logoutFailTitle": "注销失败", | ||||||
| @@ -27,8 +27,8 @@ | |||||||
|     "logoutSuccessTitle": "已登出", |     "logoutSuccessTitle": "已登出", | ||||||
|     "logoutSuccessSubtitle": "您已登出", |     "logoutSuccessSubtitle": "您已登出", | ||||||
|     "logoutTitle": "登出", |     "logoutTitle": "登出", | ||||||
|     "logoutUsernameSubtitle": "You are currently logged in as <code>{{username}}</code>. Click the button below to logout.", |     "logoutUsernameSubtitle": "您当前登录用户为<code>{{username}}</code>。点击下方按钮注销。", | ||||||
|     "logoutOauthSubtitle": "You are currently logged in as <code>{{username}}</code> using the {{provider}} OAuth provider. Click the button below to logout.", |     "logoutOauthSubtitle": "您当前以<code>{{username}}</code>登录,使用的是{{provider}} OAuth 提供商。点击下方按钮注销。", | ||||||
|     "notFoundTitle": "无法找到页面", |     "notFoundTitle": "无法找到页面", | ||||||
|     "notFoundSubtitle": "您正在查找的页面不存在。", |     "notFoundSubtitle": "您正在查找的页面不存在。", | ||||||
|     "notFoundButton": "回到主页", |     "notFoundButton": "回到主页", | ||||||
| @@ -37,17 +37,21 @@ | |||||||
|     "totpSuccessTitle": "已验证", |     "totpSuccessTitle": "已验证", | ||||||
|     "totpSuccessSubtitle": "重定向到您的应用", |     "totpSuccessSubtitle": "重定向到您的应用", | ||||||
|     "totpTitle": "输入您的 TOTP 代码", |     "totpTitle": "输入您的 TOTP 代码", | ||||||
|     "totpSubtitle": "Please enter the code from your authenticator app.", |     "totpSubtitle": "请输入您身份验证器应用中的代码。", | ||||||
|     "unauthorizedTitle": "未授权", |     "unauthorizedTitle": "未授权", | ||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "用户名为<code>{{username}}</code>的用户无权访问资源<code>{{resource}}</code>。", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "用户名为<code>{{username}}</code>的用户无权登录。", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "用户名为<code>{{username}}</code>的用户不在资源<code>{{resource}}</code>所需的组中。", | ||||||
|  |     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||||
|     "unauthorizedButton": "重试", |     "unauthorizedButton": "重试", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "untrustedRedirectTitle": "不可信的重定向", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectSubtitle": "您正在尝试重定向到一个与您已配置的域名 (<code>{{domain}}</code>) 不匹配的域名。您确定要继续吗?", | ||||||
|     "cancelTitle": "Cancel", |     "cancelTitle": "取消", | ||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "forgotPasswordTitle": "忘记密码?", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "failedToFetchProvidersTitle": "加载身份验证提供程序失败,请检查您的配置。", | ||||||
|     "errorTitle": "An error occurred", |     "errorTitle": "发生了错误", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorSubtitle": "执行此操作时发生错误,请检查控制台以获取更多信息。", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -1,53 +1,57 @@ | |||||||
| { | { | ||||||
|     "loginTitle": "Welcome back, login with", |     "loginTitle": "歡迎回來,請用以下方式登入", | ||||||
|     "loginTitleSimple": "Welcome back, please login", |     "loginTitleSimple": "歡迎回來,請登入", | ||||||
|     "loginDivider": "Or", |     "loginDivider": "或", | ||||||
|     "loginUsername": "Username", |     "loginUsername": "帳號", | ||||||
|     "loginPassword": "Password", |     "loginPassword": "密碼", | ||||||
|     "loginSubmit": "Login", |     "loginSubmit": "登入", | ||||||
|     "loginFailTitle": "Failed to log in", |     "loginFailTitle": "登入失敗", | ||||||
|     "loginFailSubtitle": "Please check your username and password", |     "loginFailSubtitle": "請檢查您的帳號與密碼", | ||||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", |     "loginFailRateLimit": "登入失敗次數過多,請稍後再試", | ||||||
|     "loginSuccessTitle": "Logged in", |     "loginSuccessTitle": "登入成功", | ||||||
|     "loginSuccessSubtitle": "Welcome back!", |     "loginSuccessSubtitle": "歡迎回來!", | ||||||
|     "loginOauthFailTitle": "An error occurred", |     "loginOauthFailTitle": "發生錯誤", | ||||||
|     "loginOauthFailSubtitle": "Failed to get OAuth URL", |     "loginOauthFailSubtitle": "無法取得 OAuth 網址", | ||||||
|     "loginOauthSuccessTitle": "Redirecting", |     "loginOauthSuccessTitle": "重新導向中", | ||||||
|     "loginOauthSuccessSubtitle": "Redirecting to your OAuth provider", |     "loginOauthSuccessSubtitle": "正在將您重新導向至 OAuth 供應商", | ||||||
|     "continueRedirectingTitle": "Redirecting...", |     "continueRedirectingTitle": "重新導向中……", | ||||||
|     "continueRedirectingSubtitle": "You should be redirected to the app soon", |     "continueRedirectingSubtitle": "您即將被重新導向至應用程式", | ||||||
|     "continueInvalidRedirectTitle": "Invalid redirect", |     "continueInvalidRedirectTitle": "無效的重新導向", | ||||||
|     "continueInvalidRedirectSubtitle": "The redirect URL is invalid", |     "continueInvalidRedirectSubtitle": "重新導向的網址無效", | ||||||
|     "continueInsecureRedirectTitle": "Insecure redirect", |     "continueInsecureRedirectTitle": "不安全的重新導向", | ||||||
|     "continueInsecureRedirectSubtitle": "You are trying to redirect from <code>https</code> to <code>http</code> which is not secure. Are you sure you want to continue?", |     "continueInsecureRedirectSubtitle": "您正嘗試從安全的 <code>https</code> 重新導向至不安全的 <code>http</code>。您確定要繼續嗎?", | ||||||
|     "continueTitle": "Continue", |     "continueTitle": "繼續", | ||||||
|     "continueSubtitle": "Click the button to continue to your app.", |     "continueSubtitle": "點擊按鈕以繼續前往您的應用程式。", | ||||||
|     "logoutFailTitle": "Failed to log out", |     "logoutFailTitle": "登出失敗", | ||||||
|     "logoutFailSubtitle": "Please try again", |     "logoutFailSubtitle": "請再試一次", | ||||||
|     "logoutSuccessTitle": "Logged out", |     "logoutSuccessTitle": "登出成功", | ||||||
|     "logoutSuccessSubtitle": "You have been logged out", |     "logoutSuccessSubtitle": "您已成功登出", | ||||||
|     "logoutTitle": "Logout", |     "logoutTitle": "登出", | ||||||
|     "logoutUsernameSubtitle": "You are currently logged in as <code>{{username}}</code>. Click the button below to logout.", |     "logoutUsernameSubtitle": "您目前以 <code>{{username}}</code> 的身分登入。點擊下方按鈕以登出。", | ||||||
|     "logoutOauthSubtitle": "You are currently logged in as <code>{{username}}</code> using the {{provider}} OAuth provider. Click the button below to logout.", |     "logoutOauthSubtitle": "您目前使用 {{provider}} OAuth 供應商並以 <code>{{username}}</code> 的身分登入。點擊下方按鈕以登出。", | ||||||
|     "notFoundTitle": "Page not found", |     "notFoundTitle": "找不到頁面", | ||||||
|     "notFoundSubtitle": "The page you are looking for does not exist.", |     "notFoundSubtitle": "您要尋找的頁面不存在。", | ||||||
|     "notFoundButton": "Go home", |     "notFoundButton": "回到首頁", | ||||||
|     "totpFailTitle": "Failed to verify code", |     "totpFailTitle": "驗證失敗", | ||||||
|     "totpFailSubtitle": "Please check your code and try again", |     "totpFailSubtitle": "請檢查您的驗證碼並再試一次", | ||||||
|     "totpSuccessTitle": "Verified", |     "totpSuccessTitle": "驗證成功", | ||||||
|     "totpSuccessSubtitle": "Redirecting to your app", |     "totpSuccessSubtitle": "正在重新導向至您的應用程式", | ||||||
|     "totpTitle": "Enter your TOTP code", |     "totpTitle": "輸入您的 TOTP 驗證碼", | ||||||
|     "totpSubtitle": "Please enter the code from your authenticator app.", |     "totpSubtitle": "請輸入您驗證器應用程式中的代碼。", | ||||||
|     "unauthorizedTitle": "Unauthorized", |     "unauthorizedTitle": "未經授權", | ||||||
|     "unauthorizedResourceSubtitle": "The user with username <code>{{username}}</code> is not authorized to access the resource <code>{{resource}}</code>.", |     "unauthorizedResourceSubtitle": "使用者 <code>{{username}}</code> 未被授權存取資源 <code>{{resource}}</code>。", | ||||||
|     "unauthorizedLoginSubtitle": "The user with username <code>{{username}}</code> is not authorized to login.", |     "unauthorizedLoginSubtitle": "使用者 <code>{{username}}</code> 未被授權登入。", | ||||||
|     "unauthorizedGroupsSubtitle": "The user with username <code>{{username}}</code> is not in the groups required by the resource <code>{{resource}}</code>.", |     "unauthorizedGroupsSubtitle": "使用者 <code>{{username}}</code> 不在存取資源 <code>{{resource}}</code> 所需的群組中。", | ||||||
|     "unauthorizedButton": "Try again", |     "unauthorizedIpSubtitle": "您的 IP 位址 <code>{{ip}}</code> 未被授權存取資源 <code>{{resource}}</code>。", | ||||||
|     "untrustedRedirectTitle": "Untrusted redirect", |     "unauthorizedButton": "再試一次", | ||||||
|     "untrustedRedirectSubtitle": "You are trying to redirect to a domain that does not match your configured domain (<code>{{domain}}</code>). Are you sure you want to continue?", |     "untrustedRedirectTitle": "不受信任的重新導向", | ||||||
|     "cancelTitle": "Cancel", |     "untrustedRedirectSubtitle": "您正嘗試重新導向至的網域與您設定的網域 (<code>{{domain}}</code>) 不符。您確定要繼續嗎?", | ||||||
|     "forgotPasswordTitle": "Forgot your password?", |     "cancelTitle": "取消", | ||||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", |     "forgotPasswordTitle": "忘記密碼?", | ||||||
|     "errorTitle": "An error occurred", |     "failedToFetchProvidersTitle": "載入驗證供應商失敗。請檢查您的設定。", | ||||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." |     "errorTitle": "發生錯誤", | ||||||
|  |     "errorSubtitle": "執行此操作時發生錯誤。請檢查主控台以獲取更多資訊。", | ||||||
|  |     "forgotPasswordMessage": "You can reset your password by changing the `USERS` environment variable.", | ||||||
|  |     "fieldRequired": "This field is required", | ||||||
|  |     "invalidInput": "Invalid input" | ||||||
| } | } | ||||||
| @@ -17,7 +17,7 @@ export const ForgotPasswordPage = () => { | |||||||
|       <CardHeader> |       <CardHeader> | ||||||
|         <CardTitle className="text-3xl">{t("forgotPasswordTitle")}</CardTitle> |         <CardTitle className="text-3xl">{t("forgotPasswordTitle")}</CardTitle> | ||||||
|         <CardDescription> |         <CardDescription> | ||||||
|           <Markdown>{forgotPasswordMessage}</Markdown> |           <Markdown>{forgotPasswordMessage !== "" ? forgotPasswordMessage : t('forgotPasswordMessage')}</Markdown> | ||||||
|         </CardDescription> |         </CardDescription> | ||||||
|       </CardHeader> |       </CardHeader> | ||||||
|     </Card> |     </Card> | ||||||
|   | |||||||
| @@ -65,7 +65,7 @@ export const LoginPage = () => { | |||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   const loginMutation = useMutation({ |   const loginMutation = useMutation({ | ||||||
|     mutationFn: (values: LoginSchema) => axios.post("/api/login", values), |     mutationFn: (values: LoginSchema) => axios.post("/api/user/login", values), | ||||||
|     mutationKey: ["login"], |     mutationKey: ["login"], | ||||||
|     onSuccess: (data) => { |     onSuccess: (data) => { | ||||||
|       if (data.data.totpPending) { |       if (data.data.totpPending) { | ||||||
| @@ -162,9 +162,9 @@ export const LoginPage = () => { | |||||||
|           /> |           /> | ||||||
|         )} |         )} | ||||||
|         {configuredProviders.length == 0 && ( |         {configuredProviders.length == 0 && ( | ||||||
|           <h3 className="text-center text-xl text-red-600"> |           <p className="text-center text-red-600 max-w-sm"> | ||||||
|             {t("failedToFetchProvidersTitle")} |             {t("failedToFetchProvidersTitle")} | ||||||
|           </h3> |           </p> | ||||||
|         )} |         )} | ||||||
|       </CardContent> |       </CardContent> | ||||||
|     </Card> |     </Card> | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ export const LogoutPage = () => { | |||||||
|   const { t } = useTranslation(); |   const { t } = useTranslation(); | ||||||
|  |  | ||||||
|   const logoutMutation = useMutation({ |   const logoutMutation = useMutation({ | ||||||
|     mutationFn: () => axios.post("/api/logout"), |     mutationFn: () => axios.post("/api/user/logout"), | ||||||
|     mutationKey: ["logout"], |     mutationKey: ["logout"], | ||||||
|     onSuccess: () => { |     onSuccess: () => { | ||||||
|       toast.success(t("logoutSuccessTitle"), { |       toast.success(t("logoutSuccessTitle"), { | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ export const TotpPage = () => { | |||||||
|   const redirectUri = searchParams.get("redirect_uri"); |   const redirectUri = searchParams.get("redirect_uri"); | ||||||
|  |  | ||||||
|   const totpMutation = useMutation({ |   const totpMutation = useMutation({ | ||||||
|     mutationFn: (values: TotpSchema) => axios.post("/api/totp", values), |     mutationFn: (values: TotpSchema) => axios.post("/api/user/totp", values), | ||||||
|     mutationKey: ["totp"], |     mutationKey: ["totp"], | ||||||
|     onSuccess: () => { |     onSuccess: () => { | ||||||
|       toast.success(t("totpSuccessTitle"), { |       toast.success(t("totpSuccessTitle"), { | ||||||
|   | |||||||
| @@ -19,6 +19,11 @@ export default defineConfig({ | |||||||
|         changeOrigin: true, |         changeOrigin: true, | ||||||
|         rewrite: (path) => path.replace(/^\/api/, ""), |         rewrite: (path) => path.replace(/^\/api/, ""), | ||||||
|       }, |       }, | ||||||
|  |       "/resources": { | ||||||
|  |         target: "http://tinyauth-backend:3000/resources", | ||||||
|  |         changeOrigin: true, | ||||||
|  |         rewrite: (path) => path.replace(/^\/resources/, ""), | ||||||
|  |       }, | ||||||
|     }, |     }, | ||||||
|     allowedHosts: true, |     allowedHosts: true, | ||||||
|   }, |   }, | ||||||
|   | |||||||
							
								
								
									
										21
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								go.mod
									
									
									
									
									
								
							| @@ -3,8 +3,9 @@ module tinyauth | |||||||
| go 1.23.2 | go 1.23.2 | ||||||
|  |  | ||||||
| require ( | require ( | ||||||
|  | 	github.com/cenkalti/backoff/v5 v5.0.3 | ||||||
| 	github.com/gin-gonic/gin v1.10.1 | 	github.com/gin-gonic/gin v1.10.1 | ||||||
| 	github.com/go-playground/validator/v10 v10.26.0 | 	github.com/go-playground/validator/v10 v10.27.0 | ||||||
| 	github.com/google/go-querystring v1.1.0 | 	github.com/google/go-querystring v1.1.0 | ||||||
| 	github.com/google/uuid v1.6.0 | 	github.com/google/uuid v1.6.0 | ||||||
| 	github.com/mdp/qrterminal/v3 v3.2.1 | 	github.com/mdp/qrterminal/v3 v3.2.1 | ||||||
| @@ -12,15 +13,17 @@ require ( | |||||||
| 	github.com/spf13/cobra v1.9.1 | 	github.com/spf13/cobra v1.9.1 | ||||||
| 	github.com/spf13/viper v1.20.1 | 	github.com/spf13/viper v1.20.1 | ||||||
| 	github.com/traefik/paerser v0.2.2 | 	github.com/traefik/paerser v0.2.2 | ||||||
| 	golang.org/x/crypto v0.39.0 | 	golang.org/x/crypto v0.41.0 | ||||||
| ) | ) | ||||||
|  |  | ||||||
| require ( | require ( | ||||||
|  | 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect | ||||||
| 	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect | 	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect | ||||||
| 	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect | 	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect | ||||||
| 	github.com/containerd/errdefs v1.0.0 // indirect | 	github.com/containerd/errdefs v1.0.0 // indirect | ||||||
| 	github.com/containerd/errdefs/pkg v0.3.0 // indirect | 	github.com/containerd/errdefs/pkg v0.3.0 // indirect | ||||||
| 	github.com/containerd/log v0.1.0 // indirect | 	github.com/containerd/log v0.1.0 // indirect | ||||||
|  | 	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect | ||||||
| 	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect | 	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect | ||||||
| 	github.com/moby/sys/atomicwriter v0.1.0 // indirect | 	github.com/moby/sys/atomicwriter v0.1.0 // indirect | ||||||
| 	github.com/moby/term v0.5.2 // indirect | 	github.com/moby/term v0.5.2 // indirect | ||||||
| @@ -29,7 +32,7 @@ require ( | |||||||
| 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect | 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect | ||||||
| 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect | 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect | ||||||
| 	go.opentelemetry.io/otel/sdk v1.34.0 // indirect | 	go.opentelemetry.io/otel/sdk v1.34.0 // indirect | ||||||
| 	golang.org/x/term v0.32.0 // indirect | 	golang.org/x/term v0.34.0 // indirect | ||||||
| 	gotest.tools/v3 v3.5.2 // indirect | 	gotest.tools/v3 v3.5.2 // indirect | ||||||
| 	rsc.io/qr v0.2.0 // indirect | 	rsc.io/qr v0.2.0 // indirect | ||||||
| ) | ) | ||||||
| @@ -51,7 +54,7 @@ require ( | |||||||
| 	github.com/charmbracelet/x/term v0.2.1 // indirect | 	github.com/charmbracelet/x/term v0.2.1 // indirect | ||||||
| 	github.com/cloudwego/base64x v0.1.4 // indirect | 	github.com/cloudwego/base64x v0.1.4 // indirect | ||||||
| 	github.com/distribution/reference v0.6.0 // indirect | 	github.com/distribution/reference v0.6.0 // indirect | ||||||
| 	github.com/docker/docker v28.3.0+incompatible | 	github.com/docker/docker v28.3.3+incompatible | ||||||
| 	github.com/docker/go-connections v0.5.0 // indirect | 	github.com/docker/go-connections v0.5.0 // indirect | ||||||
| 	github.com/docker/go-units v0.5.0 // indirect | 	github.com/docker/go-units v0.5.0 // indirect | ||||||
| 	github.com/dustin/go-humanize v1.0.1 // indirect | 	github.com/dustin/go-humanize v1.0.1 // indirect | ||||||
| @@ -60,10 +63,12 @@ require ( | |||||||
| 	github.com/fsnotify/fsnotify v1.8.0 // indirect | 	github.com/fsnotify/fsnotify v1.8.0 // indirect | ||||||
| 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect | 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect | ||||||
| 	github.com/gin-contrib/sse v1.0.0 // indirect | 	github.com/gin-contrib/sse v1.0.0 // indirect | ||||||
|  | 	github.com/go-ldap/ldap/v3 v3.4.11 | ||||||
| 	github.com/go-logr/logr v1.4.2 // indirect | 	github.com/go-logr/logr v1.4.2 // indirect | ||||||
| 	github.com/go-logr/stdr v1.2.2 // indirect | 	github.com/go-logr/stdr v1.2.2 // indirect | ||||||
| 	github.com/go-playground/locales v0.14.1 // indirect | 	github.com/go-playground/locales v0.14.1 // indirect | ||||||
| 	github.com/go-playground/universal-translator v0.18.1 // indirect | 	github.com/go-playground/universal-translator v0.18.1 // indirect | ||||||
|  | 	github.com/go-playground/validator v9.31.0+incompatible | ||||||
| 	github.com/goccy/go-json v0.10.4 // indirect | 	github.com/goccy/go-json v0.10.4 // indirect | ||||||
| 	github.com/gogo/protobuf v1.3.2 // indirect | 	github.com/gogo/protobuf v1.3.2 // indirect | ||||||
| 	github.com/gorilla/securecookie v1.1.2 // indirect | 	github.com/gorilla/securecookie v1.1.2 // indirect | ||||||
| @@ -106,11 +111,11 @@ require ( | |||||||
| 	go.uber.org/atomic v1.9.0 // indirect | 	go.uber.org/atomic v1.9.0 // indirect | ||||||
| 	go.uber.org/multierr v1.9.0 // indirect | 	go.uber.org/multierr v1.9.0 // indirect | ||||||
| 	golang.org/x/arch v0.13.0 // indirect | 	golang.org/x/arch v0.13.0 // indirect | ||||||
| 	golang.org/x/net v0.38.0 // indirect | 	golang.org/x/net v0.42.0 // indirect | ||||||
| 	golang.org/x/oauth2 v0.30.0 | 	golang.org/x/oauth2 v0.30.0 | ||||||
| 	golang.org/x/sync v0.15.0 // indirect | 	golang.org/x/sync v0.16.0 // indirect | ||||||
| 	golang.org/x/sys v0.33.0 // indirect | 	golang.org/x/sys v0.35.0 // indirect | ||||||
| 	golang.org/x/text v0.26.0 // indirect | 	golang.org/x/text v0.28.0 // indirect | ||||||
| 	google.golang.org/protobuf v1.36.3 // indirect | 	google.golang.org/protobuf v1.36.3 // indirect | ||||||
| 	gopkg.in/yaml.v3 v3.0.1 // indirect | 	gopkg.in/yaml.v3 v3.0.1 // indirect | ||||||
| ) | ) | ||||||
|   | |||||||
							
								
								
									
										58
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										58
									
								
								go.sum
									
									
									
									
									
								
							| @@ -1,9 +1,13 @@ | |||||||
| github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= | github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= | ||||||
| github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= | github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= | ||||||
|  | github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= | ||||||
|  | github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= | ||||||
| github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= | github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= | ||||||
| github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= | github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= | ||||||
| github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= | github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= | ||||||
| github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= | github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= | ||||||
|  | github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= | ||||||
|  | github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= | ||||||
| github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= | github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= | ||||||
| github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= | github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= | ||||||
| github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= | github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= | ||||||
| @@ -22,6 +26,8 @@ github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY= | |||||||
| github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc= | github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc= | ||||||
| github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= | github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= | ||||||
| github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= | github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= | ||||||
|  | github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= | ||||||
|  | github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= | ||||||
| github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs= | github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs= | ||||||
| github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg= | github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg= | ||||||
| github.com/charmbracelet/bubbletea v1.3.4 h1:kCg7B+jSCFPLYRA52SDZjr51kG/fMUEoPoZrkaDHyoI= | github.com/charmbracelet/bubbletea v1.3.4 h1:kCg7B+jSCFPLYRA52SDZjr51kG/fMUEoPoZrkaDHyoI= | ||||||
| @@ -68,8 +74,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c | |||||||
| github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||||
| github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= | github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= | ||||||
| github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= | github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= | ||||||
| github.com/docker/docker v28.3.0+incompatible h1:ffS62aKWupCWdvcee7nBU9fhnmknOqDPaJAMtfK0ImQ= | github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI= | ||||||
| github.com/docker/docker v28.3.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= | github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= | ||||||
| github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= | github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= | ||||||
| github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= | github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= | ||||||
| github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= | github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= | ||||||
| @@ -90,6 +96,10 @@ github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E | |||||||
| github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0= | github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0= | ||||||
| github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= | github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= | ||||||
| github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= | github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= | ||||||
|  | github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ4S3TGls2FvczZtj5Re/2ZzkV9VwqPHH/3Bo= | ||||||
|  | github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= | ||||||
|  | github.com/go-ldap/ldap/v3 v3.4.11 h1:4k0Yxweg+a3OyBLjdYn5OKglv18JNvfDykSoI8bW0gU= | ||||||
|  | github.com/go-ldap/ldap/v3 v3.4.11/go.mod h1:bY7t0FLK8OAVpp/vV6sSlpz3EQDGcQwc8pF0ujLgKvM= | ||||||
| github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= | github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= | ||||||
| github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= | github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= | ||||||
| github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= | github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= | ||||||
| @@ -101,8 +111,10 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o | |||||||
| github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= | github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= | ||||||
| github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= | github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= | ||||||
| github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= | github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= | ||||||
| github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k= | github.com/go-playground/validator v9.31.0+incompatible h1:UA72EPEogEnq76ehGdEDp4Mit+3FDh548oRqwVgNsHA= | ||||||
| github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= | github.com/go-playground/validator v9.31.0+incompatible/go.mod h1:yrEkQXlcI+PugkyDjY2bRrL/UBU4f3rvrgkN3V8JEig= | ||||||
|  | github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4= | ||||||
|  | github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= | ||||||
| github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk= | github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk= | ||||||
| github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= | github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= | ||||||
| github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= | github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= | ||||||
| @@ -126,8 +138,22 @@ github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzq | |||||||
| github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik= | github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik= | ||||||
| github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg= | github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg= | ||||||
| github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ= | github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ= | ||||||
|  | github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= | ||||||
|  | github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= | ||||||
| github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= | github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= | ||||||
| github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= | github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= | ||||||
|  | github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= | ||||||
|  | github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= | ||||||
|  | github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= | ||||||
|  | github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= | ||||||
|  | github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= | ||||||
|  | github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= | ||||||
|  | github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= | ||||||
|  | github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= | ||||||
|  | github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= | ||||||
|  | github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= | ||||||
|  | github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= | ||||||
|  | github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= | ||||||
| github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= | github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= | ||||||
| github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= | github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= | ||||||
| github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= | github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= | ||||||
| @@ -275,8 +301,8 @@ golang.org/x/arch v0.13.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= | |||||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||||
| golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||||
| golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||||||
| golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= | golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= | ||||||
| golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= | golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= | ||||||
| golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= | golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= | ||||||
| golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= | golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= | ||||||
| golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||||||
| @@ -285,15 +311,15 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn | |||||||
| golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||||
| golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||||
| golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | ||||||
| golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= | golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= | ||||||
| golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= | golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= | ||||||
| golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= | golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= | ||||||
| golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= | golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= | ||||||
| golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= | golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= | ||||||
| golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= | golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= | ||||||
| golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||||
| golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
| @@ -303,14 +329,14 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc | |||||||
| golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= | golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= | ||||||
| golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= | golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= | ||||||
| golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= | golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= | ||||||
| golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= | golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= | ||||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||||
| golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||||
| golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= | golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= | ||||||
| golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= | golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= | ||||||
| golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= | golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= | ||||||
| golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= | golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= | ||||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ import ( | |||||||
| 	"embed" | 	"embed" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // UI assets | // Frontend assets | ||||||
| // | // | ||||||
| //go:embed dist | //go:embed dist | ||||||
| var Assets embed.FS | var FrontendAssets embed.FS | ||||||
|   | |||||||
| @@ -1,147 +0,0 @@ | |||||||
| package auth_test |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"testing" |  | ||||||
| 	"time" |  | ||||||
| 	"tinyauth/internal/auth" |  | ||||||
| 	"tinyauth/internal/docker" |  | ||||||
| 	"tinyauth/internal/types" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| var config = types.AuthConfig{ |  | ||||||
| 	Users:          types.Users{}, |  | ||||||
| 	OauthWhitelist: "", |  | ||||||
| 	SessionExpiry:  3600, |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func TestLoginRateLimiting(t *testing.T) { |  | ||||||
| 	// Initialize a new auth service with 3 max retries and 5 seconds timeout |  | ||||||
| 	config.LoginMaxRetries = 3 |  | ||||||
| 	config.LoginTimeout = 5 |  | ||||||
| 	authService := auth.NewAuth(config, &docker.Docker{}) |  | ||||||
|  |  | ||||||
| 	// Test identifier |  | ||||||
| 	identifier := "test_user" |  | ||||||
|  |  | ||||||
| 	// Test successful login - should not lock account |  | ||||||
| 	t.Log("Testing successful login") |  | ||||||
|  |  | ||||||
| 	authService.RecordLoginAttempt(identifier, true) |  | ||||||
| 	locked, _ := authService.IsAccountLocked(identifier) |  | ||||||
|  |  | ||||||
| 	if locked { |  | ||||||
| 		t.Fatalf("Account should not be locked after successful login") |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Test 2 failed attempts - should not lock account yet |  | ||||||
| 	t.Log("Testing 2 failed login attempts") |  | ||||||
|  |  | ||||||
| 	authService.RecordLoginAttempt(identifier, false) |  | ||||||
| 	authService.RecordLoginAttempt(identifier, false) |  | ||||||
| 	locked, _ = authService.IsAccountLocked(identifier) |  | ||||||
|  |  | ||||||
| 	if locked { |  | ||||||
| 		t.Fatalf("Account should not be locked after only 2 failed attempts") |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Add one more failed attempt (total 3) - should lock account with maxRetries=3 |  | ||||||
| 	t.Log("Testing 3 failed login attempts") |  | ||||||
| 	authService.RecordLoginAttempt(identifier, false) |  | ||||||
| 	locked, remainingTime := authService.IsAccountLocked(identifier) |  | ||||||
|  |  | ||||||
| 	if !locked { |  | ||||||
| 		t.Fatalf("Account should be locked after reaching max retries") |  | ||||||
| 	} |  | ||||||
| 	if remainingTime <= 0 || remainingTime > 5 { |  | ||||||
| 		t.Fatalf("Expected remaining time between 1-5 seconds, got %d", remainingTime) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Test reset after waiting for timeout - use 1 second timeout for fast testing |  | ||||||
| 	t.Log("Testing unlocking after timeout") |  | ||||||
|  |  | ||||||
| 	// Reinitialize auth service with a shorter timeout for testing |  | ||||||
| 	config.LoginTimeout = 1 |  | ||||||
| 	config.LoginMaxRetries = 3 |  | ||||||
| 	authService = auth.NewAuth(config, &docker.Docker{}) |  | ||||||
|  |  | ||||||
| 	// Add enough failed attempts to lock the account |  | ||||||
| 	for i := 0; i < 3; i++ { |  | ||||||
| 		authService.RecordLoginAttempt(identifier, false) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Verify it's locked |  | ||||||
| 	locked, _ = authService.IsAccountLocked(identifier) |  | ||||||
| 	if !locked { |  | ||||||
| 		t.Fatalf("Account should be locked initially") |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Wait a bit and verify it gets unlocked after timeout |  | ||||||
| 	time.Sleep(1500 * time.Millisecond) // Wait longer than the timeout |  | ||||||
| 	locked, _ = authService.IsAccountLocked(identifier) |  | ||||||
|  |  | ||||||
| 	if locked { |  | ||||||
| 		t.Fatalf("Account should be unlocked after timeout period") |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Test disabled rate limiting |  | ||||||
| 	t.Log("Testing disabled rate limiting") |  | ||||||
| 	config.LoginMaxRetries = 0 |  | ||||||
| 	config.LoginTimeout = 0 |  | ||||||
| 	authService = auth.NewAuth(config, &docker.Docker{}) |  | ||||||
|  |  | ||||||
| 	for i := 0; i < 10; i++ { |  | ||||||
| 		authService.RecordLoginAttempt(identifier, false) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	locked, _ = authService.IsAccountLocked(identifier) |  | ||||||
| 	if locked { |  | ||||||
| 		t.Fatalf("Account should not be locked when rate limiting is disabled") |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func TestConcurrentLoginAttempts(t *testing.T) { |  | ||||||
| 	// Initialize a new auth service with 2 max retries and 5 seconds timeout |  | ||||||
| 	config.LoginMaxRetries = 2 |  | ||||||
| 	config.LoginTimeout = 5 |  | ||||||
| 	authService := auth.NewAuth(config, &docker.Docker{}) |  | ||||||
|  |  | ||||||
| 	// Test multiple identifiers |  | ||||||
| 	identifiers := []string{"user1", "user2", "user3"} |  | ||||||
|  |  | ||||||
| 	// Test that locking one identifier doesn't affect others |  | ||||||
| 	t.Log("Testing multiple identifiers") |  | ||||||
|  |  | ||||||
| 	// Add enough failed attempts to lock first user (2 attempts with maxRetries=2) |  | ||||||
| 	authService.RecordLoginAttempt(identifiers[0], false) |  | ||||||
| 	authService.RecordLoginAttempt(identifiers[0], false) |  | ||||||
|  |  | ||||||
| 	// Check if first user is locked |  | ||||||
| 	locked, _ := authService.IsAccountLocked(identifiers[0]) |  | ||||||
| 	if !locked { |  | ||||||
| 		t.Fatalf("User1 should be locked after reaching max retries") |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check that other users are not affected |  | ||||||
| 	for i := 1; i < len(identifiers); i++ { |  | ||||||
| 		locked, _ := authService.IsAccountLocked(identifiers[i]) |  | ||||||
| 		if locked { |  | ||||||
| 			t.Fatalf("User%d should not be locked", i+1) |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Test successful login after failed attempts (but before lock) |  | ||||||
| 	t.Log("Testing successful login after failed attempts but before lock") |  | ||||||
|  |  | ||||||
| 	// One failed attempt for user2 |  | ||||||
| 	authService.RecordLoginAttempt(identifiers[1], false) |  | ||||||
|  |  | ||||||
| 	// Successful login should reset the counter |  | ||||||
| 	authService.RecordLoginAttempt(identifiers[1], true) |  | ||||||
|  |  | ||||||
| 	// Now try a failed login again - should not be locked as counter was reset |  | ||||||
| 	authService.RecordLoginAttempt(identifiers[1], false) |  | ||||||
| 	locked, _ = authService.IsAccountLocked(identifiers[1]) |  | ||||||
| 	if locked { |  | ||||||
| 		t.Fatalf("User2 should not be locked after successful login reset") |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
							
								
								
									
										260
									
								
								internal/bootstrap/app_bootstrap.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										260
									
								
								internal/bootstrap/app_bootstrap.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,260 @@ | |||||||
|  | package bootstrap | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"fmt" | ||||||
|  | 	"strings" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  | 	"tinyauth/internal/controller" | ||||||
|  | 	"tinyauth/internal/middleware" | ||||||
|  | 	"tinyauth/internal/service" | ||||||
|  | 	"tinyauth/internal/utils" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type Controller interface { | ||||||
|  | 	SetupRoutes() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type Middleware interface { | ||||||
|  | 	Middleware() gin.HandlerFunc | ||||||
|  | 	Init() error | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type Service interface { | ||||||
|  | 	Init() error | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type BootstrapApp struct { | ||||||
|  | 	Config config.Config | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewBootstrapApp(config config.Config) *BootstrapApp { | ||||||
|  | 	return &BootstrapApp{ | ||||||
|  | 		Config: config, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (app *BootstrapApp) Setup() error { | ||||||
|  | 	// Parse users | ||||||
|  | 	users, err := utils.GetUsers(app.Config.Users, app.Config.UsersFile) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Get domain | ||||||
|  | 	domain, err := utils.GetUpperDomain(app.Config.AppURL) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Cookie names | ||||||
|  | 	cookieId := utils.GenerateIdentifier(strings.Split(domain, ".")[0]) | ||||||
|  | 	sessionCookieName := fmt.Sprintf("%s-%s", config.SessionCookieName, cookieId) | ||||||
|  | 	csrfCookieName := fmt.Sprintf("%s-%s", config.CSRFCookieName, cookieId) | ||||||
|  | 	redirectCookieName := fmt.Sprintf("%s-%s", config.RedirectCookieName, cookieId) | ||||||
|  |  | ||||||
|  | 	// Secrets | ||||||
|  | 	encryptionSecret, err := utils.DeriveKey(app.Config.Secret, "encryption") | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	hmacSecret, err := utils.DeriveKey(app.Config.Secret, "hmac") | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Create configs | ||||||
|  | 	authConfig := service.AuthServiceConfig{ | ||||||
|  | 		Users:             users, | ||||||
|  | 		OauthWhitelist:    app.Config.OAuthWhitelist, | ||||||
|  | 		SessionExpiry:     app.Config.SessionExpiry, | ||||||
|  | 		SecureCookie:      app.Config.SecureCookie, | ||||||
|  | 		Domain:            domain, | ||||||
|  | 		LoginTimeout:      app.Config.LoginTimeout, | ||||||
|  | 		LoginMaxRetries:   app.Config.LoginMaxRetries, | ||||||
|  | 		SessionCookieName: sessionCookieName, | ||||||
|  | 		HMACSecret:        hmacSecret, | ||||||
|  | 		EncryptionSecret:  encryptionSecret, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Setup services | ||||||
|  | 	var ldapService *service.LdapService | ||||||
|  |  | ||||||
|  | 	if app.Config.LdapAddress != "" { | ||||||
|  | 		ldapConfig := service.LdapServiceConfig{ | ||||||
|  | 			Address:      app.Config.LdapAddress, | ||||||
|  | 			BindDN:       app.Config.LdapBindDN, | ||||||
|  | 			BindPassword: app.Config.LdapBindPassword, | ||||||
|  | 			BaseDN:       app.Config.LdapBaseDN, | ||||||
|  | 			Insecure:     app.Config.LdapInsecure, | ||||||
|  | 			SearchFilter: app.Config.LdapSearchFilter, | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		ldapService = service.NewLdapService(ldapConfig) | ||||||
|  |  | ||||||
|  | 		err := ldapService.Init() | ||||||
|  |  | ||||||
|  | 		if err != nil { | ||||||
|  | 			log.Warn().Err(err).Msg("Failed to initialize LDAP service, continuing without LDAP") | ||||||
|  | 			ldapService = nil | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	dockerService := service.NewDockerService() | ||||||
|  | 	authService := service.NewAuthService(authConfig, dockerService, ldapService) | ||||||
|  | 	oauthBrokerService := service.NewOAuthBrokerService(app.getOAuthBrokerConfig()) | ||||||
|  |  | ||||||
|  | 	// Initialize services | ||||||
|  | 	services := []Service{ | ||||||
|  | 		dockerService, | ||||||
|  | 		authService, | ||||||
|  | 		oauthBrokerService, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	for _, svc := range services { | ||||||
|  | 		if svc != nil { | ||||||
|  | 			log.Debug().Str("service", fmt.Sprintf("%T", svc)).Msg("Initializing service") | ||||||
|  | 			err := svc.Init() | ||||||
|  | 			if err != nil { | ||||||
|  | 				return err | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Configured providers | ||||||
|  | 	var configuredProviders []string | ||||||
|  |  | ||||||
|  | 	if authService.UserAuthConfigured() || ldapService != nil { | ||||||
|  | 		configuredProviders = append(configuredProviders, "username") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	configuredProviders = append(configuredProviders, oauthBrokerService.GetConfiguredServices()...) | ||||||
|  |  | ||||||
|  | 	if len(configuredProviders) == 0 { | ||||||
|  | 		return fmt.Errorf("no authentication providers configured") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Create engine | ||||||
|  | 	engine := gin.New() | ||||||
|  |  | ||||||
|  | 	if config.Version != "development" { | ||||||
|  | 		gin.SetMode(gin.ReleaseMode) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Create middlewares | ||||||
|  | 	var middlewares []Middleware | ||||||
|  |  | ||||||
|  | 	contextMiddleware := middleware.NewContextMiddleware(middleware.ContextMiddlewareConfig{ | ||||||
|  | 		Domain: domain, | ||||||
|  | 	}, authService, oauthBrokerService) | ||||||
|  |  | ||||||
|  | 	uiMiddleware := middleware.NewUIMiddleware() | ||||||
|  | 	zerologMiddleware := middleware.NewZerologMiddleware() | ||||||
|  |  | ||||||
|  | 	middlewares = append(middlewares, contextMiddleware, uiMiddleware, zerologMiddleware) | ||||||
|  |  | ||||||
|  | 	for _, middleware := range middlewares { | ||||||
|  | 		log.Debug().Str("middleware", fmt.Sprintf("%T", middleware)).Msg("Initializing middleware") | ||||||
|  | 		err := middleware.Init() | ||||||
|  | 		if err != nil { | ||||||
|  | 			return fmt.Errorf("failed to initialize middleware %T: %w", middleware, err) | ||||||
|  | 		} | ||||||
|  | 		engine.Use(middleware.Middleware()) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Create routers | ||||||
|  | 	mainRouter := engine.Group("") | ||||||
|  | 	apiRouter := engine.Group("/api") | ||||||
|  |  | ||||||
|  | 	// Create controllers | ||||||
|  | 	contextController := controller.NewContextController(controller.ContextControllerConfig{ | ||||||
|  | 		ConfiguredProviders:   configuredProviders, | ||||||
|  | 		DisableContinue:       app.Config.DisableContinue, | ||||||
|  | 		Title:                 app.Config.Title, | ||||||
|  | 		GenericName:           app.Config.GenericName, | ||||||
|  | 		Domain:                domain, | ||||||
|  | 		ForgotPasswordMessage: app.Config.FogotPasswordMessage, | ||||||
|  | 		BackgroundImage:       app.Config.BackgroundImage, | ||||||
|  | 		OAuthAutoRedirect:     app.Config.OAuthAutoRedirect, | ||||||
|  | 	}, apiRouter) | ||||||
|  |  | ||||||
|  | 	oauthController := controller.NewOAuthController(controller.OAuthControllerConfig{ | ||||||
|  | 		AppURL:             app.Config.AppURL, | ||||||
|  | 		SecureCookie:       app.Config.SecureCookie, | ||||||
|  | 		CSRFCookieName:     csrfCookieName, | ||||||
|  | 		RedirectCookieName: redirectCookieName, | ||||||
|  | 		Domain:             domain, | ||||||
|  | 	}, apiRouter, authService, oauthBrokerService) | ||||||
|  |  | ||||||
|  | 	proxyController := controller.NewProxyController(controller.ProxyControllerConfig{ | ||||||
|  | 		AppURL: app.Config.AppURL, | ||||||
|  | 	}, apiRouter, dockerService, authService) | ||||||
|  |  | ||||||
|  | 	userController := controller.NewUserController(controller.UserControllerConfig{ | ||||||
|  | 		Domain: domain, | ||||||
|  | 	}, apiRouter, authService) | ||||||
|  |  | ||||||
|  | 	resourcesController := controller.NewResourcesController(controller.ResourcesControllerConfig{ | ||||||
|  | 		ResourcesDir: app.Config.ResourcesDir, | ||||||
|  | 	}, mainRouter) | ||||||
|  |  | ||||||
|  | 	healthController := controller.NewHealthController(apiRouter) | ||||||
|  |  | ||||||
|  | 	// Setup routes | ||||||
|  | 	controller := []Controller{ | ||||||
|  | 		contextController, | ||||||
|  | 		oauthController, | ||||||
|  | 		proxyController, | ||||||
|  | 		userController, | ||||||
|  | 		healthController, | ||||||
|  | 		resourcesController, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	for _, ctrl := range controller { | ||||||
|  | 		log.Debug().Msgf("Setting up %T controller", ctrl) | ||||||
|  | 		ctrl.SetupRoutes() | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Start server | ||||||
|  | 	address := fmt.Sprintf("%s:%d", app.Config.Address, app.Config.Port) | ||||||
|  | 	log.Info().Msgf("Starting server on %s", address) | ||||||
|  | 	if err := engine.Run(address); err != nil { | ||||||
|  | 		log.Fatal().Err(err).Msg("Failed to start server") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | // Temporary | ||||||
|  | func (app *BootstrapApp) getOAuthBrokerConfig() map[string]config.OAuthServiceConfig { | ||||||
|  | 	return map[string]config.OAuthServiceConfig{ | ||||||
|  | 		"google": { | ||||||
|  | 			ClientID:     app.Config.GoogleClientId, | ||||||
|  | 			ClientSecret: app.Config.GoogleClientSecret, | ||||||
|  | 			RedirectURL:  fmt.Sprintf("%s/api/oauth/callback/google", app.Config.AppURL), | ||||||
|  | 		}, | ||||||
|  | 		"github": { | ||||||
|  | 			ClientID:     app.Config.GithubClientId, | ||||||
|  | 			ClientSecret: app.Config.GithubClientSecret, | ||||||
|  | 			RedirectURL:  fmt.Sprintf("%s/api/oauth/callback/github", app.Config.AppURL), | ||||||
|  | 		}, | ||||||
|  | 		"generic": { | ||||||
|  | 			ClientID:           app.Config.GenericClientId, | ||||||
|  | 			ClientSecret:       app.Config.GenericClientSecret, | ||||||
|  | 			RedirectURL:        fmt.Sprintf("%s/api/oauth/callback/generic", app.Config.AppURL), | ||||||
|  | 			Scopes:             strings.Split(app.Config.GenericScopes, ","), | ||||||
|  | 			AuthURL:            app.Config.GenericAuthURL, | ||||||
|  | 			TokenURL:           app.Config.GenericTokenURL, | ||||||
|  | 			UserinfoURL:        app.Config.GenericUserURL, | ||||||
|  | 			InsecureSkipVerify: app.Config.GenericSkipSSL, | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | } | ||||||
| @@ -1,6 +1,20 @@ | |||||||
| package types | package config | ||||||
|  | 
 | ||||||
|  | type Claims struct { | ||||||
|  | 	Name              string `json:"name"` | ||||||
|  | 	Email             string `json:"email"` | ||||||
|  | 	PreferredUsername string `json:"preferred_username"` | ||||||
|  | 	Groups            any    `json:"groups"` | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | var Version = "development" | ||||||
|  | var CommitHash = "n/a" | ||||||
|  | var BuildTimestamp = "n/a" | ||||||
|  | 
 | ||||||
|  | var SessionCookieName = "tinyauth-session" | ||||||
|  | var CSRFCookieName = "tinyauth-csrf" | ||||||
|  | var RedirectCookieName = "tinyauth-redirect" | ||||||
| 
 | 
 | ||||||
| // Config is the configuration for the tinyauth server |  | ||||||
| type Config struct { | type Config struct { | ||||||
| 	Port                    int    `mapstructure:"port" validate:"required"` | 	Port                    int    `mapstructure:"port" validate:"required"` | ||||||
| 	Address                 string `validate:"required,ip4_addr" mapstructure:"address"` | 	Address                 string `validate:"required,ip4_addr" mapstructure:"address"` | ||||||
| @@ -9,7 +23,7 @@ type Config struct { | |||||||
| 	AppURL                  string `validate:"required,url" mapstructure:"app-url"` | 	AppURL                  string `validate:"required,url" mapstructure:"app-url"` | ||||||
| 	Users                   string `mapstructure:"users"` | 	Users                   string `mapstructure:"users"` | ||||||
| 	UsersFile               string `mapstructure:"users-file"` | 	UsersFile               string `mapstructure:"users-file"` | ||||||
| 	CookieSecure            bool   `mapstructure:"cookie-secure"` | 	SecureCookie            bool   `mapstructure:"secure-cookie"` | ||||||
| 	GithubClientId          string `mapstructure:"github-client-id"` | 	GithubClientId          string `mapstructure:"github-client-id"` | ||||||
| 	GithubClientSecret      string `mapstructure:"github-client-secret"` | 	GithubClientSecret      string `mapstructure:"github-client-secret"` | ||||||
| 	GithubClientSecretFile  string `mapstructure:"github-client-secret-file"` | 	GithubClientSecretFile  string `mapstructure:"github-client-secret-file"` | ||||||
| @@ -29,96 +43,102 @@ type Config struct { | |||||||
| 	OAuthWhitelist          string `mapstructure:"oauth-whitelist"` | 	OAuthWhitelist          string `mapstructure:"oauth-whitelist"` | ||||||
| 	OAuthAutoRedirect       string `mapstructure:"oauth-auto-redirect" validate:"oneof=none github google generic"` | 	OAuthAutoRedirect       string `mapstructure:"oauth-auto-redirect" validate:"oneof=none github google generic"` | ||||||
| 	SessionExpiry           int    `mapstructure:"session-expiry"` | 	SessionExpiry           int    `mapstructure:"session-expiry"` | ||||||
| 	LogLevel                int8   `mapstructure:"log-level" validate:"min=-1,max=5"` | 	LogLevel                string `mapstructure:"log-level" validate:"oneof=trace debug info warn error fatal panic"` | ||||||
| 	Title                   string `mapstructure:"app-title"` | 	Title                   string `mapstructure:"app-title"` | ||||||
| 	EnvFile                 string `mapstructure:"env-file"` |  | ||||||
| 	LoginTimeout            int    `mapstructure:"login-timeout"` | 	LoginTimeout            int    `mapstructure:"login-timeout"` | ||||||
| 	LoginMaxRetries         int    `mapstructure:"login-max-retries"` | 	LoginMaxRetries         int    `mapstructure:"login-max-retries"` | ||||||
| 	FogotPasswordMessage    string `mapstructure:"forgot-password-message" validate:"required"` | 	FogotPasswordMessage    string `mapstructure:"forgot-password-message"` | ||||||
| 	BackgroundImage         string `mapstructure:"background-image" validate:"required"` | 	BackgroundImage         string `mapstructure:"background-image" validate:"required"` | ||||||
|  | 	LdapAddress             string `mapstructure:"ldap-address"` | ||||||
|  | 	LdapBindDN              string `mapstructure:"ldap-bind-dn"` | ||||||
|  | 	LdapBindPassword        string `mapstructure:"ldap-bind-password"` | ||||||
|  | 	LdapBaseDN              string `mapstructure:"ldap-base-dn"` | ||||||
|  | 	LdapInsecure            bool   `mapstructure:"ldap-insecure"` | ||||||
|  | 	LdapSearchFilter        string `mapstructure:"ldap-search-filter"` | ||||||
|  | 	ResourcesDir            string `mapstructure:"resources-dir"` | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Server configuration |  | ||||||
| type HandlersConfig struct { |  | ||||||
| 	AppURL                string |  | ||||||
| 	Domain                string |  | ||||||
| 	CookieSecure          bool |  | ||||||
| 	DisableContinue       bool |  | ||||||
| 	GenericName           string |  | ||||||
| 	Title                 string |  | ||||||
| 	ForgotPasswordMessage string |  | ||||||
| 	BackgroundImage       string |  | ||||||
| 	OAuthAutoRedirect     string |  | ||||||
| 	CsrfCookieName        string |  | ||||||
| 	RedirectCookieName    string |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // OAuthConfig is the configuration for the providers |  | ||||||
| type OAuthConfig struct { |  | ||||||
| 	GithubClientId      string |  | ||||||
| 	GithubClientSecret  string |  | ||||||
| 	GoogleClientId      string |  | ||||||
| 	GoogleClientSecret  string |  | ||||||
| 	GenericClientId     string |  | ||||||
| 	GenericClientSecret string |  | ||||||
| 	GenericScopes       []string |  | ||||||
| 	GenericAuthURL      string |  | ||||||
| 	GenericTokenURL     string |  | ||||||
| 	GenericUserURL      string |  | ||||||
| 	GenericSkipSSL      bool |  | ||||||
| 	AppURL              string |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // ServerConfig is the configuration for the server |  | ||||||
| type ServerConfig struct { |  | ||||||
| 	Port    int |  | ||||||
| 	Address string |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // AuthConfig is the configuration for the auth service |  | ||||||
| type AuthConfig struct { |  | ||||||
| 	Users             Users |  | ||||||
| 	OauthWhitelist    string |  | ||||||
| 	SessionExpiry     int |  | ||||||
| 	CookieSecure      bool |  | ||||||
| 	Domain            string |  | ||||||
| 	LoginTimeout      int |  | ||||||
| 	LoginMaxRetries   int |  | ||||||
| 	SessionCookieName string |  | ||||||
| 	HMACSecret        string |  | ||||||
| 	EncryptionSecret  string |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // HooksConfig is the configuration for the hooks service |  | ||||||
| type HooksConfig struct { |  | ||||||
| 	Domain string |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // OAuthLabels is a list of labels that can be used in a tinyauth protected container |  | ||||||
| type OAuthLabels struct { | type OAuthLabels struct { | ||||||
| 	Whitelist string | 	Whitelist string | ||||||
| 	Groups    string | 	Groups    string | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Basic auth labels for a tinyauth protected container |  | ||||||
| type BasicLabels struct { | type BasicLabels struct { | ||||||
| 	User     string | 	Username string | ||||||
| 	Password string | 	Password PasswordLabels | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | type PasswordLabels struct { | ||||||
|  | 	Plain string | ||||||
|  | 	File  string | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // IP labels for a tinyauth protected container |  | ||||||
| type IPLabels struct { | type IPLabels struct { | ||||||
| 	Allow []string | 	Allow  []string | ||||||
| 	Block []string | 	Block  []string | ||||||
|  | 	Bypass []string | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Labels is a struct that contains the labels for a tinyauth protected container |  | ||||||
| type Labels struct { | type Labels struct { | ||||||
| 	Users   string | 	Users   string | ||||||
| 	Allowed string | 	Allowed string | ||||||
| 	Headers []string | 	Headers []string | ||||||
| 	Domain  string | 	Domain  []string | ||||||
| 	Basic   BasicLabels | 	Basic   BasicLabels | ||||||
| 	OAuth   OAuthLabels | 	OAuth   OAuthLabels | ||||||
| 	IP      IPLabels | 	IP      IPLabels | ||||||
| } | } | ||||||
|  | 
 | ||||||
|  | type OAuthServiceConfig struct { | ||||||
|  | 	ClientID           string | ||||||
|  | 	ClientSecret       string | ||||||
|  | 	Scopes             []string | ||||||
|  | 	RedirectURL        string | ||||||
|  | 	AuthURL            string | ||||||
|  | 	TokenURL           string | ||||||
|  | 	UserinfoURL        string | ||||||
|  | 	InsecureSkipVerify bool | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | type User struct { | ||||||
|  | 	Username   string | ||||||
|  | 	Password   string | ||||||
|  | 	TotpSecret string | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | type UserSearch struct { | ||||||
|  | 	Username string | ||||||
|  | 	Type     string // local, ldap or unknown | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | type SessionCookie struct { | ||||||
|  | 	Username    string | ||||||
|  | 	Name        string | ||||||
|  | 	Email       string | ||||||
|  | 	Provider    string | ||||||
|  | 	TotpPending bool | ||||||
|  | 	OAuthGroups string | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | type UserContext struct { | ||||||
|  | 	Username    string | ||||||
|  | 	Name        string | ||||||
|  | 	Email       string | ||||||
|  | 	IsLoggedIn  bool | ||||||
|  | 	OAuth       bool | ||||||
|  | 	Provider    string | ||||||
|  | 	TotpPending bool | ||||||
|  | 	OAuthGroups string | ||||||
|  | 	TotpEnabled bool | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | type UnauthorizedQuery struct { | ||||||
|  | 	Username string `url:"username"` | ||||||
|  | 	Resource string `url:"resource"` | ||||||
|  | 	GroupErr bool   `url:"groupErr"` | ||||||
|  | 	IP       string `url:"ip"` | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | type RedirectQuery struct { | ||||||
|  | 	RedirectURI string `url:"redirect_uri"` | ||||||
|  | } | ||||||
| @@ -1,19 +0,0 @@ | |||||||
| package constants |  | ||||||
|  |  | ||||||
| // Claims are the OIDC supported claims (including preferd username for some reason) |  | ||||||
| type Claims struct { |  | ||||||
| 	Name              string   `json:"name"` |  | ||||||
| 	Email             string   `json:"email"` |  | ||||||
| 	PreferredUsername string   `json:"preferred_username"` |  | ||||||
| 	Groups            []string `json:"groups"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Version information |  | ||||||
| var Version = "development" |  | ||||||
| var CommitHash = "n/a" |  | ||||||
| var BuildTimestamp = "n/a" |  | ||||||
|  |  | ||||||
| // Cookie names |  | ||||||
| var SessionCookieName = "tinyauth-session" |  | ||||||
| var CsrfCookieName = "tinyauth-csrf" |  | ||||||
| var RedirectCookieName = "tinyauth-redirect" |  | ||||||
							
								
								
									
										104
									
								
								internal/controller/context_controller.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										104
									
								
								internal/controller/context_controller.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,104 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"tinyauth/internal/utils" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type UserContextResponse struct { | ||||||
|  | 	Status      int    `json:"status"` | ||||||
|  | 	Message     string `json:"message"` | ||||||
|  | 	IsLoggedIn  bool   `json:"isLoggedIn"` | ||||||
|  | 	Username    string `json:"username"` | ||||||
|  | 	Name        string `json:"name"` | ||||||
|  | 	Email       string `json:"email"` | ||||||
|  | 	Provider    string `json:"provider"` | ||||||
|  | 	Oauth       bool   `json:"oauth"` | ||||||
|  | 	TotpPending bool   `json:"totpPending"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type AppContextResponse struct { | ||||||
|  | 	Status                int      `json:"status"` | ||||||
|  | 	Message               string   `json:"message"` | ||||||
|  | 	ConfiguredProviders   []string `json:"configuredProviders"` | ||||||
|  | 	DisableContinue       bool     `json:"disableContinue"` | ||||||
|  | 	Title                 string   `json:"title"` | ||||||
|  | 	GenericName           string   `json:"genericName"` | ||||||
|  | 	Domain                string   `json:"domain"` | ||||||
|  | 	ForgotPasswordMessage string   `json:"forgotPasswordMessage"` | ||||||
|  | 	BackgroundImage       string   `json:"backgroundImage"` | ||||||
|  | 	OAuthAutoRedirect     string   `json:"oauthAutoRedirect"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type ContextControllerConfig struct { | ||||||
|  | 	ConfiguredProviders   []string | ||||||
|  | 	DisableContinue       bool | ||||||
|  | 	Title                 string | ||||||
|  | 	GenericName           string | ||||||
|  | 	Domain                string | ||||||
|  | 	ForgotPasswordMessage string | ||||||
|  | 	BackgroundImage       string | ||||||
|  | 	OAuthAutoRedirect     string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type ContextController struct { | ||||||
|  | 	Config ContextControllerConfig | ||||||
|  | 	Router *gin.RouterGroup | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewContextController(config ContextControllerConfig, router *gin.RouterGroup) *ContextController { | ||||||
|  | 	return &ContextController{ | ||||||
|  | 		Config: config, | ||||||
|  | 		Router: router, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *ContextController) SetupRoutes() { | ||||||
|  | 	contextGroup := controller.Router.Group("/context") | ||||||
|  | 	contextGroup.GET("/user", controller.userContextHandler) | ||||||
|  | 	contextGroup.GET("/app", controller.appContextHandler) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *ContextController) userContextHandler(c *gin.Context) { | ||||||
|  | 	context, err := utils.GetContext(c) | ||||||
|  |  | ||||||
|  | 	userContext := UserContextResponse{ | ||||||
|  | 		Status:      200, | ||||||
|  | 		Message:     "Success", | ||||||
|  | 		IsLoggedIn:  context.IsLoggedIn, | ||||||
|  | 		Username:    context.Username, | ||||||
|  | 		Name:        context.Name, | ||||||
|  | 		Email:       context.Email, | ||||||
|  | 		Provider:    context.Provider, | ||||||
|  | 		Oauth:       context.OAuth, | ||||||
|  | 		TotpPending: context.TotpPending, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Debug().Err(err).Msg("No user context found in request") | ||||||
|  | 		userContext.Status = 401 | ||||||
|  | 		userContext.Message = "Unauthorized" | ||||||
|  | 		userContext.IsLoggedIn = false | ||||||
|  | 		c.JSON(200, userContext) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	c.JSON(200, userContext) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *ContextController) appContextHandler(c *gin.Context) { | ||||||
|  | 	c.JSON(200, AppContextResponse{ | ||||||
|  | 		Status:                200, | ||||||
|  | 		Message:               "Success", | ||||||
|  | 		ConfiguredProviders:   controller.Config.ConfiguredProviders, | ||||||
|  | 		DisableContinue:       controller.Config.DisableContinue, | ||||||
|  | 		Title:                 controller.Config.Title, | ||||||
|  | 		GenericName:           controller.Config.GenericName, | ||||||
|  | 		Domain:                controller.Config.Domain, | ||||||
|  | 		ForgotPasswordMessage: controller.Config.ForgotPasswordMessage, | ||||||
|  | 		BackgroundImage:       controller.Config.BackgroundImage, | ||||||
|  | 		OAuthAutoRedirect:     controller.Config.OAuthAutoRedirect, | ||||||
|  | 	}) | ||||||
|  | } | ||||||
							
								
								
									
										25
									
								
								internal/controller/health_controller.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								internal/controller/health_controller.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,25 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import "github.com/gin-gonic/gin" | ||||||
|  |  | ||||||
|  | type HealthController struct { | ||||||
|  | 	Router *gin.RouterGroup | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewHealthController(router *gin.RouterGroup) *HealthController { | ||||||
|  | 	return &HealthController{ | ||||||
|  | 		Router: router, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *HealthController) SetupRoutes() { | ||||||
|  | 	controller.Router.GET("/health", controller.healthHandler) | ||||||
|  | 	controller.Router.HEAD("/health", controller.healthHandler) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *HealthController) healthHandler(c *gin.Context) { | ||||||
|  | 	c.JSON(200, gin.H{ | ||||||
|  | 		"status":  "ok", | ||||||
|  | 		"message": "Healthy", | ||||||
|  | 	}) | ||||||
|  | } | ||||||
							
								
								
									
										200
									
								
								internal/controller/oauth_controller.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										200
									
								
								internal/controller/oauth_controller.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,200 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"fmt" | ||||||
|  | 	"net/http" | ||||||
|  | 	"strings" | ||||||
|  | 	"time" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  | 	"tinyauth/internal/service" | ||||||
|  | 	"tinyauth/internal/utils" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"github.com/google/go-querystring/query" | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type OAuthRequest struct { | ||||||
|  | 	Provider string `uri:"provider" binding:"required"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type OAuthControllerConfig struct { | ||||||
|  | 	CSRFCookieName     string | ||||||
|  | 	RedirectCookieName string | ||||||
|  | 	SecureCookie       bool | ||||||
|  | 	AppURL             string | ||||||
|  | 	Domain             string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type OAuthController struct { | ||||||
|  | 	Config OAuthControllerConfig | ||||||
|  | 	Router *gin.RouterGroup | ||||||
|  | 	Auth   *service.AuthService | ||||||
|  | 	Broker *service.OAuthBrokerService | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewOAuthController(config OAuthControllerConfig, router *gin.RouterGroup, auth *service.AuthService, broker *service.OAuthBrokerService) *OAuthController { | ||||||
|  | 	return &OAuthController{ | ||||||
|  | 		Config: config, | ||||||
|  | 		Router: router, | ||||||
|  | 		Auth:   auth, | ||||||
|  | 		Broker: broker, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *OAuthController) SetupRoutes() { | ||||||
|  | 	oauthGroup := controller.Router.Group("/oauth") | ||||||
|  | 	oauthGroup.GET("/url/:provider", controller.oauthURLHandler) | ||||||
|  | 	oauthGroup.GET("/callback/:provider", controller.oauthCallbackHandler) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *OAuthController) oauthURLHandler(c *gin.Context) { | ||||||
|  | 	var req OAuthRequest | ||||||
|  |  | ||||||
|  | 	err := c.BindUri(&req) | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to bind URI") | ||||||
|  | 		c.JSON(400, gin.H{ | ||||||
|  | 			"status":  400, | ||||||
|  | 			"message": "Bad Request", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	service, exists := controller.Broker.GetService(req.Provider) | ||||||
|  |  | ||||||
|  | 	if !exists { | ||||||
|  | 		log.Warn().Msgf("OAuth provider not found: %s", req.Provider) | ||||||
|  | 		c.JSON(404, gin.H{ | ||||||
|  | 			"status":  404, | ||||||
|  | 			"message": "Not Found", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	state := service.GenerateState() | ||||||
|  | 	authURL := service.GetAuthURL(state) | ||||||
|  | 	c.SetCookie(controller.Config.CSRFCookieName, state, int(time.Hour.Seconds()), "/", fmt.Sprintf(".%s", controller.Config.Domain), controller.Config.SecureCookie, true) | ||||||
|  |  | ||||||
|  | 	redirectURI := c.Query("redirect_uri") | ||||||
|  |  | ||||||
|  | 	if redirectURI != "" && utils.IsRedirectSafe(redirectURI, controller.Config.Domain) { | ||||||
|  | 		log.Debug().Msg("Setting redirect URI cookie") | ||||||
|  | 		c.SetCookie(controller.Config.RedirectCookieName, redirectURI, int(time.Hour.Seconds()), "/", fmt.Sprintf(".%s", controller.Config.Domain), controller.Config.SecureCookie, true) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	c.JSON(200, gin.H{ | ||||||
|  | 		"status":  200, | ||||||
|  | 		"message": "OK", | ||||||
|  | 		"url":     authURL, | ||||||
|  | 	}) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *OAuthController) oauthCallbackHandler(c *gin.Context) { | ||||||
|  | 	var req OAuthRequest | ||||||
|  |  | ||||||
|  | 	err := c.BindUri(&req) | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to bind URI") | ||||||
|  | 		c.JSON(400, gin.H{ | ||||||
|  | 			"status":  400, | ||||||
|  | 			"message": "Bad Request", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	state := c.Query("state") | ||||||
|  | 	csrfCookie, err := c.Cookie(controller.Config.CSRFCookieName) | ||||||
|  |  | ||||||
|  | 	if err != nil || state != csrfCookie { | ||||||
|  | 		log.Warn().Err(err).Msg("CSRF token mismatch or cookie missing") | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	c.SetCookie(controller.Config.CSRFCookieName, "", -1, "/", fmt.Sprintf(".%s", controller.Config.Domain), controller.Config.SecureCookie, true) | ||||||
|  |  | ||||||
|  | 	code := c.Query("code") | ||||||
|  | 	service, exists := controller.Broker.GetService(req.Provider) | ||||||
|  |  | ||||||
|  | 	if !exists { | ||||||
|  | 		log.Warn().Msgf("OAuth provider not found: %s", req.Provider) | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	err = service.VerifyCode(code) | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to verify OAuth code") | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	user, err := controller.Broker.GetUser(req.Provider) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to get user from OAuth provider") | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if user.Email == "" { | ||||||
|  | 		log.Error().Msg("OAuth provider did not return an email") | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if !controller.Auth.EmailWhitelisted(user.Email) { | ||||||
|  | 		queries, err := query.Values(config.UnauthorizedQuery{ | ||||||
|  | 			Username: user.Email, | ||||||
|  | 		}) | ||||||
|  |  | ||||||
|  | 		if err != nil { | ||||||
|  | 			log.Error().Err(err).Msg("Failed to encode unauthorized query") | ||||||
|  | 			c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/unauthorized?%s", controller.Config.AppURL, queries.Encode())) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	var name string | ||||||
|  |  | ||||||
|  | 	if user.Name != "" { | ||||||
|  | 		log.Debug().Msg("Using name from OAuth provider") | ||||||
|  | 		name = user.Name | ||||||
|  | 	} else { | ||||||
|  | 		log.Debug().Msg("No name from OAuth provider, using pseudo name") | ||||||
|  | 		name = fmt.Sprintf("%s (%s)", utils.Capitalize(strings.Split(user.Email, "@")[0]), strings.Split(user.Email, "@")[1]) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	controller.Auth.CreateSessionCookie(c, &config.SessionCookie{ | ||||||
|  | 		Username:    user.Email, | ||||||
|  | 		Name:        name, | ||||||
|  | 		Email:       user.Email, | ||||||
|  | 		Provider:    req.Provider, | ||||||
|  | 		OAuthGroups: utils.CoalesceToString(user.Groups), | ||||||
|  | 	}) | ||||||
|  |  | ||||||
|  | 	redirectURI, err := c.Cookie(controller.Config.RedirectCookieName) | ||||||
|  |  | ||||||
|  | 	if err != nil || !utils.IsRedirectSafe(redirectURI, controller.Config.Domain) { | ||||||
|  | 		log.Debug().Msg("No redirect URI cookie found, redirecting to app root") | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, controller.Config.AppURL) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	queries, err := query.Values(config.RedirectQuery{ | ||||||
|  | 		RedirectURI: redirectURI, | ||||||
|  | 	}) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to encode redirect URI query") | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	c.SetCookie(controller.Config.RedirectCookieName, "", -1, "/", fmt.Sprintf(".%s", controller.Config.Domain), controller.Config.SecureCookie, true) | ||||||
|  | 	c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/continue?%s", controller.Config.AppURL, queries.Encode())) | ||||||
|  | } | ||||||
							
								
								
									
										311
									
								
								internal/controller/proxy_controller.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										311
									
								
								internal/controller/proxy_controller.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,311 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"fmt" | ||||||
|  | 	"net/http" | ||||||
|  | 	"strings" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  | 	"tinyauth/internal/service" | ||||||
|  | 	"tinyauth/internal/utils" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"github.com/google/go-querystring/query" | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type Proxy struct { | ||||||
|  | 	Proxy string `uri:"proxy" binding:"required"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type ProxyControllerConfig struct { | ||||||
|  | 	AppURL string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type ProxyController struct { | ||||||
|  | 	Config ProxyControllerConfig | ||||||
|  | 	Router *gin.RouterGroup | ||||||
|  | 	Docker *service.DockerService | ||||||
|  | 	Auth   *service.AuthService | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewProxyController(config ProxyControllerConfig, router *gin.RouterGroup, docker *service.DockerService, auth *service.AuthService) *ProxyController { | ||||||
|  | 	return &ProxyController{ | ||||||
|  | 		Config: config, | ||||||
|  | 		Router: router, | ||||||
|  | 		Docker: docker, | ||||||
|  | 		Auth:   auth, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *ProxyController) SetupRoutes() { | ||||||
|  | 	proxyGroup := controller.Router.Group("/auth") | ||||||
|  | 	proxyGroup.GET("/:proxy", controller.proxyHandler) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *ProxyController) proxyHandler(c *gin.Context) { | ||||||
|  | 	var req Proxy | ||||||
|  |  | ||||||
|  | 	err := c.BindUri(&req) | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to bind URI") | ||||||
|  | 		c.JSON(400, gin.H{ | ||||||
|  | 			"status":  400, | ||||||
|  | 			"message": "Bad Request", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	isBrowser := strings.Contains(c.Request.Header.Get("Accept"), "text/html") | ||||||
|  |  | ||||||
|  | 	if isBrowser { | ||||||
|  | 		log.Debug().Msg("Request identified as (most likely) coming from a browser") | ||||||
|  | 	} else { | ||||||
|  | 		log.Debug().Msg("Request identified as (most likely) coming from a non-browser client") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	uri := c.Request.Header.Get("X-Forwarded-Uri") | ||||||
|  | 	proto := c.Request.Header.Get("X-Forwarded-Proto") | ||||||
|  | 	host := c.Request.Header.Get("X-Forwarded-Host") | ||||||
|  |  | ||||||
|  | 	hostWithoutPort := strings.Split(host, ":")[0] | ||||||
|  | 	id := strings.Split(hostWithoutPort, ".")[0] | ||||||
|  |  | ||||||
|  | 	labels, err := controller.Docker.GetLabels(id, hostWithoutPort) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to get labels from Docker") | ||||||
|  |  | ||||||
|  | 		if req.Proxy == "nginx" || !isBrowser { | ||||||
|  | 			c.JSON(500, gin.H{ | ||||||
|  | 				"status":  500, | ||||||
|  | 				"message": "Internal Server Error", | ||||||
|  | 			}) | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	clientIP := c.ClientIP() | ||||||
|  |  | ||||||
|  | 	if controller.Auth.BypassedIP(labels, clientIP) { | ||||||
|  | 		c.Header("Authorization", c.Request.Header.Get("Authorization")) | ||||||
|  |  | ||||||
|  | 		headers := utils.ParseHeaders(labels.Headers) | ||||||
|  |  | ||||||
|  | 		for key, value := range headers { | ||||||
|  | 			log.Debug().Str("header", key).Msg("Setting header") | ||||||
|  | 			c.Header(key, value) | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if labels.Basic.Username != "" && utils.GetSecret(labels.Basic.Password.Plain, labels.Basic.Password.File) != "" { | ||||||
|  | 			log.Debug().Str("username", labels.Basic.Username).Msg("Setting basic auth header") | ||||||
|  | 			c.Header("Authorization", fmt.Sprintf("Basic %s", utils.GetBasicAuth(labels.Basic.Username, utils.GetSecret(labels.Basic.Password.Plain, labels.Basic.Password.File)))) | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		c.JSON(200, gin.H{ | ||||||
|  | 			"status":  200, | ||||||
|  | 			"message": "Authenticated", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if !controller.Auth.CheckIP(labels, clientIP) { | ||||||
|  | 		if req.Proxy == "nginx" || !isBrowser { | ||||||
|  | 			c.JSON(401, gin.H{ | ||||||
|  | 				"status":  401, | ||||||
|  | 				"message": "Unauthorized", | ||||||
|  | 			}) | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		queries, err := query.Values(config.UnauthorizedQuery{ | ||||||
|  | 			Resource: strings.Split(host, ".")[0], | ||||||
|  | 			IP:       clientIP, | ||||||
|  | 		}) | ||||||
|  |  | ||||||
|  | 		if err != nil { | ||||||
|  | 			log.Error().Err(err).Msg("Failed to encode unauthorized query") | ||||||
|  | 			c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/unauthorized?%s", controller.Config.AppURL, queries.Encode())) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	authEnabled, err := controller.Auth.AuthEnabled(uri, labels) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to check if auth is enabled for resource") | ||||||
|  |  | ||||||
|  | 		if req.Proxy == "nginx" || !isBrowser { | ||||||
|  | 			c.JSON(500, gin.H{ | ||||||
|  | 				"status":  500, | ||||||
|  | 				"message": "Internal Server Error", | ||||||
|  | 			}) | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if !authEnabled { | ||||||
|  | 		log.Debug().Msg("Authentication disabled for resource, allowing access") | ||||||
|  |  | ||||||
|  | 		c.Header("Authorization", c.Request.Header.Get("Authorization")) | ||||||
|  |  | ||||||
|  | 		headers := utils.ParseHeaders(labels.Headers) | ||||||
|  |  | ||||||
|  | 		for key, value := range headers { | ||||||
|  | 			log.Debug().Str("header", key).Msg("Setting header") | ||||||
|  | 			c.Header(key, value) | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if labels.Basic.Username != "" && utils.GetSecret(labels.Basic.Password.Plain, labels.Basic.Password.File) != "" { | ||||||
|  | 			log.Debug().Str("username", labels.Basic.Username).Msg("Setting basic auth header") | ||||||
|  | 			c.Header("Authorization", fmt.Sprintf("Basic %s", utils.GetBasicAuth(labels.Basic.Username, utils.GetSecret(labels.Basic.Password.Plain, labels.Basic.Password.File)))) | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		c.JSON(200, gin.H{ | ||||||
|  | 			"status":  200, | ||||||
|  | 			"message": "Authenticated", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	var userContext config.UserContext | ||||||
|  |  | ||||||
|  | 	context, err := utils.GetContext(c) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Debug().Msg("No user context found in request, treating as not logged in") | ||||||
|  | 		userContext = config.UserContext{ | ||||||
|  | 			IsLoggedIn: false, | ||||||
|  | 		} | ||||||
|  | 	} else { | ||||||
|  | 		userContext = context | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if userContext.Provider == "basic" && userContext.TotpEnabled { | ||||||
|  | 		log.Debug().Msg("User has TOTP enabled, denying basic auth access") | ||||||
|  | 		userContext.IsLoggedIn = false | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if userContext.IsLoggedIn { | ||||||
|  | 		appAllowed := controller.Auth.ResourceAllowed(c, userContext, labels) | ||||||
|  |  | ||||||
|  | 		if !appAllowed { | ||||||
|  | 			log.Warn().Str("user", userContext.Username).Str("resource", strings.Split(host, ".")[0]).Msg("User not allowed to access resource") | ||||||
|  |  | ||||||
|  | 			if req.Proxy == "nginx" || !isBrowser { | ||||||
|  | 				c.JSON(403, gin.H{ | ||||||
|  | 					"status":  403, | ||||||
|  | 					"message": "Forbidden", | ||||||
|  | 				}) | ||||||
|  | 				return | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			queries, err := query.Values(config.UnauthorizedQuery{ | ||||||
|  | 				Resource: strings.Split(host, ".")[0], | ||||||
|  | 			}) | ||||||
|  |  | ||||||
|  | 			if userContext.OAuth { | ||||||
|  | 				queries.Set("username", userContext.Email) | ||||||
|  | 			} else { | ||||||
|  | 				queries.Set("username", userContext.Username) | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			if err != nil { | ||||||
|  | 				log.Error().Err(err).Msg("Failed to encode unauthorized query") | ||||||
|  | 				c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 				return | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/unauthorized?%s", controller.Config.AppURL, queries.Encode())) | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if userContext.OAuth { | ||||||
|  | 			groupOK := controller.Auth.OAuthGroup(c, userContext, labels) | ||||||
|  |  | ||||||
|  | 			if !groupOK { | ||||||
|  | 				log.Warn().Str("user", userContext.Username).Str("resource", strings.Split(host, ".")[0]).Msg("User OAuth groups do not match resource requirements") | ||||||
|  |  | ||||||
|  | 				if req.Proxy == "nginx" || !isBrowser { | ||||||
|  | 					c.JSON(403, gin.H{ | ||||||
|  | 						"status":  403, | ||||||
|  | 						"message": "Forbidden", | ||||||
|  | 					}) | ||||||
|  | 					return | ||||||
|  | 				} | ||||||
|  |  | ||||||
|  | 				queries, err := query.Values(config.UnauthorizedQuery{ | ||||||
|  | 					Resource: strings.Split(host, ".")[0], | ||||||
|  | 					GroupErr: true, | ||||||
|  | 				}) | ||||||
|  |  | ||||||
|  | 				if userContext.OAuth { | ||||||
|  | 					queries.Set("username", userContext.Email) | ||||||
|  | 				} else { | ||||||
|  | 					queries.Set("username", userContext.Username) | ||||||
|  | 				} | ||||||
|  |  | ||||||
|  | 				if err != nil { | ||||||
|  | 					log.Error().Err(err).Msg("Failed to encode unauthorized query") | ||||||
|  | 					c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 					return | ||||||
|  | 				} | ||||||
|  |  | ||||||
|  | 				c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/unauthorized?%s", controller.Config.AppURL, queries.Encode())) | ||||||
|  | 				return | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		c.Header("Authorization", c.Request.Header.Get("Authorization")) | ||||||
|  | 		c.Header("Remote-User", utils.SanitizeHeader(userContext.Username)) | ||||||
|  | 		c.Header("Remote-Name", utils.SanitizeHeader(userContext.Name)) | ||||||
|  | 		c.Header("Remote-Email", utils.SanitizeHeader(userContext.Email)) | ||||||
|  | 		c.Header("Remote-Groups", utils.SanitizeHeader(userContext.OAuthGroups)) | ||||||
|  |  | ||||||
|  | 		headers := utils.ParseHeaders(labels.Headers) | ||||||
|  |  | ||||||
|  | 		for key, value := range headers { | ||||||
|  | 			log.Debug().Str("header", key).Msg("Setting header") | ||||||
|  | 			c.Header(key, value) | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if labels.Basic.Username != "" && utils.GetSecret(labels.Basic.Password.Plain, labels.Basic.Password.File) != "" { | ||||||
|  | 			log.Debug().Str("username", labels.Basic.Username).Msg("Setting basic auth header") | ||||||
|  | 			c.Header("Authorization", fmt.Sprintf("Basic %s", utils.GetBasicAuth(labels.Basic.Username, utils.GetSecret(labels.Basic.Password.Plain, labels.Basic.Password.File)))) | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		c.JSON(200, gin.H{ | ||||||
|  | 			"status":  200, | ||||||
|  | 			"message": "Authenticated", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if req.Proxy == "nginx" || !isBrowser { | ||||||
|  | 		c.JSON(401, gin.H{ | ||||||
|  | 			"status":  401, | ||||||
|  | 			"message": "Unauthorized", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	queries, err := query.Values(config.RedirectQuery{ | ||||||
|  | 		RedirectURI: fmt.Sprintf("%s://%s%s", proto, host, uri), | ||||||
|  | 	}) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to encode redirect URI query") | ||||||
|  | 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", controller.Config.AppURL)) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/login?%s", controller.Config.AppURL, queries.Encode())) | ||||||
|  | } | ||||||
							
								
								
									
										42
									
								
								internal/controller/resources_controller.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								internal/controller/resources_controller.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,42 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"net/http" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type ResourcesControllerConfig struct { | ||||||
|  | 	ResourcesDir string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type ResourcesController struct { | ||||||
|  | 	Config     ResourcesControllerConfig | ||||||
|  | 	Router     *gin.RouterGroup | ||||||
|  | 	FileServer http.Handler | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewResourcesController(config ResourcesControllerConfig, router *gin.RouterGroup) *ResourcesController { | ||||||
|  | 	fileServer := http.StripPrefix("/resources", http.FileServer(http.Dir(config.ResourcesDir))) | ||||||
|  |  | ||||||
|  | 	return &ResourcesController{ | ||||||
|  | 		Config:     config, | ||||||
|  | 		Router:     router, | ||||||
|  | 		FileServer: fileServer, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *ResourcesController) SetupRoutes() { | ||||||
|  | 	controller.Router.GET("/resources/*resource", controller.resourcesHandler) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *ResourcesController) resourcesHandler(c *gin.Context) { | ||||||
|  | 	if controller.Config.ResourcesDir == "" { | ||||||
|  | 		c.JSON(404, gin.H{ | ||||||
|  | 			"status":  404, | ||||||
|  | 			"message": "Resources not found", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  | 	controller.FileServer.ServeHTTP(c.Writer, c.Request) | ||||||
|  | } | ||||||
							
								
								
									
										266
									
								
								internal/controller/user_controller.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										266
									
								
								internal/controller/user_controller.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,266 @@ | |||||||
|  | package controller | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"fmt" | ||||||
|  | 	"strings" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  | 	"tinyauth/internal/service" | ||||||
|  | 	"tinyauth/internal/utils" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"github.com/pquerna/otp/totp" | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type LoginRequest struct { | ||||||
|  | 	Username string `json:"username"` | ||||||
|  | 	Password string `json:"password"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type TotpRequest struct { | ||||||
|  | 	Code string `json:"code"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type UserControllerConfig struct { | ||||||
|  | 	Domain string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type UserController struct { | ||||||
|  | 	Config UserControllerConfig | ||||||
|  | 	Router *gin.RouterGroup | ||||||
|  | 	Auth   *service.AuthService | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewUserController(config UserControllerConfig, router *gin.RouterGroup, auth *service.AuthService) *UserController { | ||||||
|  | 	return &UserController{ | ||||||
|  | 		Config: config, | ||||||
|  | 		Router: router, | ||||||
|  | 		Auth:   auth, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *UserController) SetupRoutes() { | ||||||
|  | 	userGroup := controller.Router.Group("/user") | ||||||
|  | 	userGroup.POST("/login", controller.loginHandler) | ||||||
|  | 	userGroup.POST("/logout", controller.logoutHandler) | ||||||
|  | 	userGroup.POST("/totp", controller.totpHandler) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *UserController) loginHandler(c *gin.Context) { | ||||||
|  | 	var req LoginRequest | ||||||
|  |  | ||||||
|  | 	err := c.ShouldBindJSON(&req) | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to bind JSON") | ||||||
|  | 		c.JSON(400, gin.H{ | ||||||
|  | 			"status":  400, | ||||||
|  | 			"message": "Bad Request", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	clientIP := c.ClientIP() | ||||||
|  |  | ||||||
|  | 	rateIdentifier := req.Username | ||||||
|  |  | ||||||
|  | 	if rateIdentifier == "" { | ||||||
|  | 		rateIdentifier = clientIP | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	log.Debug().Str("username", req.Username).Str("ip", clientIP).Msg("Login attempt") | ||||||
|  |  | ||||||
|  | 	isLocked, remainingTime := controller.Auth.IsAccountLocked(rateIdentifier) | ||||||
|  |  | ||||||
|  | 	if isLocked { | ||||||
|  | 		log.Warn().Str("username", req.Username).Str("ip", clientIP).Msg("Account is locked due to too many failed login attempts") | ||||||
|  | 		c.JSON(429, gin.H{ | ||||||
|  | 			"status":  429, | ||||||
|  | 			"message": fmt.Sprintf("Too many failed login attempts. Try again in %d seconds", remainingTime), | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	userSearch := controller.Auth.SearchUser(req.Username) | ||||||
|  |  | ||||||
|  | 	if userSearch.Type == "" { | ||||||
|  | 		log.Warn().Str("username", req.Username).Str("ip", clientIP).Msg("User not found") | ||||||
|  | 		controller.Auth.RecordLoginAttempt(rateIdentifier, false) | ||||||
|  | 		c.JSON(401, gin.H{ | ||||||
|  | 			"status":  401, | ||||||
|  | 			"message": "Unauthorized", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if !controller.Auth.VerifyUser(userSearch, req.Password) { | ||||||
|  | 		log.Warn().Str("username", req.Username).Str("ip", clientIP).Msg("Invalid password") | ||||||
|  | 		controller.Auth.RecordLoginAttempt(rateIdentifier, false) | ||||||
|  | 		c.JSON(401, gin.H{ | ||||||
|  | 			"status":  401, | ||||||
|  | 			"message": "Unauthorized", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	log.Info().Str("username", req.Username).Str("ip", clientIP).Msg("Login successful") | ||||||
|  |  | ||||||
|  | 	controller.Auth.RecordLoginAttempt(rateIdentifier, true) | ||||||
|  |  | ||||||
|  | 	if userSearch.Type == "local" { | ||||||
|  | 		user := controller.Auth.GetLocalUser(userSearch.Username) | ||||||
|  |  | ||||||
|  | 		if user.TotpSecret != "" { | ||||||
|  | 			log.Debug().Str("username", req.Username).Msg("User has TOTP enabled, requiring TOTP verification") | ||||||
|  |  | ||||||
|  | 			err := controller.Auth.CreateSessionCookie(c, &config.SessionCookie{ | ||||||
|  | 				Username:    user.Username, | ||||||
|  | 				Name:        utils.Capitalize(req.Username), | ||||||
|  | 				Email:       fmt.Sprintf("%s@%s", strings.ToLower(req.Username), controller.Config.Domain), | ||||||
|  | 				Provider:    "username", | ||||||
|  | 				TotpPending: true, | ||||||
|  | 			}) | ||||||
|  |  | ||||||
|  | 			if err != nil { | ||||||
|  | 				log.Error().Err(err).Msg("Failed to create session cookie") | ||||||
|  | 				c.JSON(500, gin.H{ | ||||||
|  | 					"status":  500, | ||||||
|  | 					"message": "Internal Server Error", | ||||||
|  | 				}) | ||||||
|  | 				return | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			c.JSON(200, gin.H{ | ||||||
|  | 				"status":      200, | ||||||
|  | 				"message":     "TOTP required", | ||||||
|  | 				"totpPending": true, | ||||||
|  | 			}) | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	err = controller.Auth.CreateSessionCookie(c, &config.SessionCookie{ | ||||||
|  | 		Username: req.Username, | ||||||
|  | 		Name:     utils.Capitalize(req.Username), | ||||||
|  | 		Email:    fmt.Sprintf("%s@%s", strings.ToLower(req.Username), controller.Config.Domain), | ||||||
|  | 		Provider: "username", | ||||||
|  | 	}) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to create session cookie") | ||||||
|  | 		c.JSON(500, gin.H{ | ||||||
|  | 			"status":  500, | ||||||
|  | 			"message": "Internal Server Error", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	c.JSON(200, gin.H{ | ||||||
|  | 		"status":  200, | ||||||
|  | 		"message": "Login successful", | ||||||
|  | 	}) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *UserController) logoutHandler(c *gin.Context) { | ||||||
|  | 	log.Debug().Msg("Logout request received") | ||||||
|  |  | ||||||
|  | 	controller.Auth.DeleteSessionCookie(c) | ||||||
|  |  | ||||||
|  | 	c.JSON(200, gin.H{ | ||||||
|  | 		"status":  200, | ||||||
|  | 		"message": "Logout successful", | ||||||
|  | 	}) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (controller *UserController) totpHandler(c *gin.Context) { | ||||||
|  | 	var req TotpRequest | ||||||
|  |  | ||||||
|  | 	err := c.ShouldBindJSON(&req) | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to bind JSON") | ||||||
|  | 		c.JSON(400, gin.H{ | ||||||
|  | 			"status":  400, | ||||||
|  | 			"message": "Bad Request", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	context, err := utils.GetContext(c) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to get user context") | ||||||
|  | 		c.JSON(500, gin.H{ | ||||||
|  | 			"status":  500, | ||||||
|  | 			"message": "Internal Server Error", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if !context.TotpPending { | ||||||
|  | 		log.Warn().Msg("TOTP attempt without a pending TOTP session") | ||||||
|  | 		c.JSON(401, gin.H{ | ||||||
|  | 			"status":  401, | ||||||
|  | 			"message": "Unauthorized", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	clientIP := c.ClientIP() | ||||||
|  |  | ||||||
|  | 	rateIdentifier := context.Username | ||||||
|  |  | ||||||
|  | 	if rateIdentifier == "" { | ||||||
|  | 		rateIdentifier = clientIP | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	log.Debug().Str("username", context.Username).Str("ip", clientIP).Msg("TOTP verification attempt") | ||||||
|  |  | ||||||
|  | 	isLocked, remainingTime := controller.Auth.IsAccountLocked(rateIdentifier) | ||||||
|  |  | ||||||
|  | 	if isLocked { | ||||||
|  | 		log.Warn().Str("username", context.Username).Str("ip", clientIP).Msg("Account is locked due to too many failed TOTP attempts") | ||||||
|  | 		c.JSON(429, gin.H{ | ||||||
|  | 			"status":  429, | ||||||
|  | 			"message": fmt.Sprintf("Too many failed login attempts. Try again in %d seconds", remainingTime), | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	user := controller.Auth.GetLocalUser(context.Username) | ||||||
|  |  | ||||||
|  | 	ok := totp.Validate(req.Code, user.TotpSecret) | ||||||
|  |  | ||||||
|  | 	if !ok { | ||||||
|  | 		log.Warn().Str("username", context.Username).Str("ip", clientIP).Msg("Invalid TOTP code") | ||||||
|  | 		controller.Auth.RecordLoginAttempt(rateIdentifier, false) | ||||||
|  | 		c.JSON(401, gin.H{ | ||||||
|  | 			"status":  401, | ||||||
|  | 			"message": "Unauthorized", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	log.Info().Str("username", context.Username).Str("ip", clientIP).Msg("TOTP verification successful") | ||||||
|  |  | ||||||
|  | 	controller.Auth.RecordLoginAttempt(rateIdentifier, true) | ||||||
|  |  | ||||||
|  | 	err = controller.Auth.CreateSessionCookie(c, &config.SessionCookie{ | ||||||
|  | 		Username: user.Username, | ||||||
|  | 		Name:     utils.Capitalize(user.Username), | ||||||
|  | 		Email:    fmt.Sprintf("%s@%s", strings.ToLower(user.Username), controller.Config.Domain), | ||||||
|  | 		Provider: "username", | ||||||
|  | 	}) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		log.Error().Err(err).Msg("Failed to create session cookie") | ||||||
|  | 		c.JSON(500, gin.H{ | ||||||
|  | 			"status":  500, | ||||||
|  | 			"message": "Internal Server Error", | ||||||
|  | 		}) | ||||||
|  | 		return | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	c.JSON(200, gin.H{ | ||||||
|  | 		"status":  200, | ||||||
|  | 		"message": "Login successful", | ||||||
|  | 	}) | ||||||
|  | } | ||||||
| @@ -1,126 +0,0 @@ | |||||||
| package docker |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"context" |  | ||||||
| 	"strings" |  | ||||||
| 	"tinyauth/internal/types" |  | ||||||
| 	"tinyauth/internal/utils" |  | ||||||
|  |  | ||||||
| 	container "github.com/docker/docker/api/types/container" |  | ||||||
| 	"github.com/docker/docker/client" |  | ||||||
| 	"github.com/rs/zerolog/log" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| type Docker struct { |  | ||||||
| 	Client  *client.Client |  | ||||||
| 	Context context.Context |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func NewDocker() (*Docker, error) { |  | ||||||
| 	// Create a new docker client |  | ||||||
| 	client, err := client.NewClientWithOpts(client.FromEnv) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return nil, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Create the context |  | ||||||
| 	ctx := context.Background() |  | ||||||
|  |  | ||||||
| 	// Negotiate API version |  | ||||||
| 	client.NegotiateAPIVersion(ctx) |  | ||||||
|  |  | ||||||
| 	return &Docker{ |  | ||||||
| 		Client:  client, |  | ||||||
| 		Context: ctx, |  | ||||||
| 	}, nil |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (docker *Docker) GetContainers() ([]container.Summary, error) { |  | ||||||
| 	// Get the list of containers |  | ||||||
| 	containers, err := docker.Client.ContainerList(docker.Context, container.ListOptions{}) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return nil, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Return the containers |  | ||||||
| 	return containers, nil |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (docker *Docker) InspectContainer(containerId string) (container.InspectResponse, error) { |  | ||||||
| 	// Inspect the container |  | ||||||
| 	inspect, err := docker.Client.ContainerInspect(docker.Context, containerId) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return container.InspectResponse{}, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Return the inspect |  | ||||||
| 	return inspect, nil |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (docker *Docker) DockerConnected() bool { |  | ||||||
| 	// Ping the docker client if there is an error it is not connected |  | ||||||
| 	_, err := docker.Client.Ping(docker.Context) |  | ||||||
| 	return err == nil |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (docker *Docker) GetLabels(id string, domain string) (types.Labels, error) { |  | ||||||
| 	// Check if we have access to the Docker API |  | ||||||
| 	isConnected := docker.DockerConnected() |  | ||||||
|  |  | ||||||
| 	// If we don't have access, return an empty struct |  | ||||||
| 	if !isConnected { |  | ||||||
| 		log.Debug().Msg("Docker not connected, returning empty labels") |  | ||||||
| 		return types.Labels{}, nil |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Get the containers |  | ||||||
| 	log.Debug().Msg("Getting containers") |  | ||||||
|  |  | ||||||
| 	containers, err := docker.GetContainers() |  | ||||||
|  |  | ||||||
| 	// If there is an error, return false |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Error getting containers") |  | ||||||
| 		return types.Labels{}, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Loop through the containers |  | ||||||
| 	for _, container := range containers { |  | ||||||
| 		// Inspect the container |  | ||||||
| 		inspect, err := docker.InspectContainer(container.ID) |  | ||||||
|  |  | ||||||
| 		// Check if there was an error |  | ||||||
| 		if err != nil { |  | ||||||
| 			log.Warn().Str("id", container.ID).Err(err).Msg("Error inspecting container, skipping") |  | ||||||
| 			continue |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Get the labels |  | ||||||
| 		log.Debug().Str("id", inspect.ID).Msg("Getting labels for container") |  | ||||||
|  |  | ||||||
| 		labels, err := utils.GetLabels(inspect.Config.Labels) |  | ||||||
|  |  | ||||||
| 		// Check if there was an error |  | ||||||
| 		if err != nil { |  | ||||||
| 			log.Warn().Str("id", container.ID).Err(err).Msg("Error getting container labels, skipping") |  | ||||||
| 			continue |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Check if the labels match the id or the domain |  | ||||||
| 		if strings.TrimPrefix(inspect.Name, "/") == id || labels.Domain == domain { |  | ||||||
| 			log.Debug().Str("id", inspect.ID).Msg("Found matching container") |  | ||||||
| 			return labels, nil |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("No matching container found, returning empty labels") |  | ||||||
|  |  | ||||||
| 	// If no matching container is found, return empty labels |  | ||||||
| 	return types.Labels{}, nil |  | ||||||
| } |  | ||||||
| @@ -1,823 +0,0 @@ | |||||||
| package handlers |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"fmt" |  | ||||||
| 	"net/http" |  | ||||||
| 	"strings" |  | ||||||
| 	"time" |  | ||||||
| 	"tinyauth/internal/auth" |  | ||||||
| 	"tinyauth/internal/docker" |  | ||||||
| 	"tinyauth/internal/hooks" |  | ||||||
| 	"tinyauth/internal/providers" |  | ||||||
| 	"tinyauth/internal/types" |  | ||||||
| 	"tinyauth/internal/utils" |  | ||||||
|  |  | ||||||
| 	"github.com/gin-gonic/gin" |  | ||||||
| 	"github.com/google/go-querystring/query" |  | ||||||
| 	"github.com/pquerna/otp/totp" |  | ||||||
| 	"github.com/rs/zerolog/log" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| type Handlers struct { |  | ||||||
| 	Config    types.HandlersConfig |  | ||||||
| 	Auth      *auth.Auth |  | ||||||
| 	Hooks     *hooks.Hooks |  | ||||||
| 	Providers *providers.Providers |  | ||||||
| 	Docker    *docker.Docker |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func NewHandlers(config types.HandlersConfig, auth *auth.Auth, hooks *hooks.Hooks, providers *providers.Providers, docker *docker.Docker) *Handlers { |  | ||||||
| 	return &Handlers{ |  | ||||||
| 		Config:    config, |  | ||||||
| 		Auth:      auth, |  | ||||||
| 		Hooks:     hooks, |  | ||||||
| 		Providers: providers, |  | ||||||
| 		Docker:    docker, |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (h *Handlers) AuthHandler(c *gin.Context) { |  | ||||||
| 	// Create struct for proxy |  | ||||||
| 	var proxy types.Proxy |  | ||||||
|  |  | ||||||
| 	// Bind URI |  | ||||||
| 	err := c.BindUri(&proxy) |  | ||||||
|  |  | ||||||
| 	// Handle error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to bind URI") |  | ||||||
| 		c.JSON(400, gin.H{ |  | ||||||
| 			"status":  400, |  | ||||||
| 			"message": "Bad Request", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check if the request is coming from a browser (tools like curl/bruno use */* and they don't include the text/html) |  | ||||||
| 	isBrowser := strings.Contains(c.Request.Header.Get("Accept"), "text/html") |  | ||||||
|  |  | ||||||
| 	if isBrowser { |  | ||||||
| 		log.Debug().Msg("Request is most likely coming from a browser") |  | ||||||
| 	} else { |  | ||||||
| 		log.Debug().Msg("Request is most likely not coming from a browser") |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Interface("proxy", proxy.Proxy).Msg("Got proxy") |  | ||||||
|  |  | ||||||
| 	// Get headers |  | ||||||
| 	uri := c.Request.Header.Get("X-Forwarded-Uri") |  | ||||||
| 	proto := c.Request.Header.Get("X-Forwarded-Proto") |  | ||||||
| 	host := c.Request.Header.Get("X-Forwarded-Host") |  | ||||||
|  |  | ||||||
| 	// Remove the port from the host if it exists |  | ||||||
| 	hostPortless := strings.Split(host, ":")[0] // *lol* |  | ||||||
|  |  | ||||||
| 	// Get the id |  | ||||||
| 	id := strings.Split(hostPortless, ".")[0] |  | ||||||
|  |  | ||||||
| 	// Get the container labels |  | ||||||
| 	labels, err := h.Docker.GetLabels(id, hostPortless) |  | ||||||
|  |  | ||||||
| 	log.Debug().Interface("labels", labels).Msg("Got labels") |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to get container labels") |  | ||||||
|  |  | ||||||
| 		if proxy.Proxy == "nginx" || !isBrowser { |  | ||||||
| 			c.JSON(500, gin.H{ |  | ||||||
| 				"status":  500, |  | ||||||
| 				"message": "Internal Server Error", |  | ||||||
| 			}) |  | ||||||
| 			return |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check if the IP is allowed/blocked |  | ||||||
| 	ip := c.ClientIP() |  | ||||||
| 	if !h.Auth.CheckIP(c, labels) { |  | ||||||
| 		log.Warn().Str("ip", ip).Msg("IP not allowed") |  | ||||||
|  |  | ||||||
| 		if proxy.Proxy == "nginx" || !isBrowser { |  | ||||||
| 			c.JSON(403, gin.H{ |  | ||||||
| 				"status":  403, |  | ||||||
| 				"message": "Forbidden", |  | ||||||
| 			}) |  | ||||||
| 			return |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		values := types.UnauthorizedQuery{ |  | ||||||
| 			Resource: strings.Split(host, ".")[0], |  | ||||||
| 			IP:       ip, |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Build query |  | ||||||
| 		queries, err := query.Values(values) |  | ||||||
|  |  | ||||||
| 		// Handle error |  | ||||||
| 		if err != nil { |  | ||||||
| 			log.Error().Err(err).Msg("Failed to build queries") |  | ||||||
| 			c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 			return |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/unauthorized?%s", h.Config.AppURL, queries.Encode())) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check if auth is enabled |  | ||||||
| 	authEnabled, err := h.Auth.AuthEnabled(c, labels) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to check if app is allowed") |  | ||||||
|  |  | ||||||
| 		if proxy.Proxy == "nginx" || !isBrowser { |  | ||||||
| 			c.JSON(500, gin.H{ |  | ||||||
| 				"status":  500, |  | ||||||
| 				"message": "Internal Server Error", |  | ||||||
| 			}) |  | ||||||
| 			return |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// If auth is not enabled, return 200 |  | ||||||
| 	if !authEnabled { |  | ||||||
| 		headersParsed := utils.ParseHeaders(labels.Headers) |  | ||||||
| 		for key, value := range headersParsed { |  | ||||||
| 			log.Debug().Str("key", key).Msg("Setting header") |  | ||||||
| 			c.Header(key, value) |  | ||||||
| 		} |  | ||||||
| 		if labels.Basic.User != "" && labels.Basic.Password != "" { |  | ||||||
| 			log.Debug().Str("username", labels.Basic.User).Msg("Setting basic auth headers") |  | ||||||
| 			c.Header("Authorization", fmt.Sprintf("Basic %s", utils.GetBasicAuth(labels.Basic.User, labels.Basic.Password))) |  | ||||||
| 		} |  | ||||||
| 		c.JSON(200, gin.H{ |  | ||||||
| 			"status":  200, |  | ||||||
| 			"message": "Authenticated", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Get user context |  | ||||||
| 	userContext := h.Hooks.UseUserContext(c) |  | ||||||
|  |  | ||||||
| 	// If we are using basic auth, we need to check if the user has totp and if it does then disable basic auth |  | ||||||
| 	if userContext.Provider == "basic" && userContext.TotpEnabled { |  | ||||||
| 		log.Warn().Str("username", userContext.Username).Msg("User has totp enabled, disabling basic auth") |  | ||||||
| 		userContext.IsLoggedIn = false |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check if user is logged in |  | ||||||
| 	if userContext.IsLoggedIn { |  | ||||||
| 		log.Debug().Msg("Authenticated") |  | ||||||
|  |  | ||||||
| 		// Check if user is allowed to access subdomain, if request is nginx.example.com the subdomain (resource) is nginx |  | ||||||
| 		appAllowed := h.Auth.ResourceAllowed(c, userContext, labels) |  | ||||||
|  |  | ||||||
| 		log.Debug().Bool("appAllowed", appAllowed).Msg("Checking if app is allowed") |  | ||||||
|  |  | ||||||
| 		// The user is not allowed to access the app |  | ||||||
| 		if !appAllowed { |  | ||||||
| 			log.Warn().Str("username", userContext.Username).Str("host", host).Msg("User not allowed") |  | ||||||
|  |  | ||||||
| 			if proxy.Proxy == "nginx" || !isBrowser { |  | ||||||
| 				c.JSON(401, gin.H{ |  | ||||||
| 					"status":  401, |  | ||||||
| 					"message": "Unauthorized", |  | ||||||
| 				}) |  | ||||||
| 				return |  | ||||||
| 			} |  | ||||||
|  |  | ||||||
| 			// Values |  | ||||||
| 			values := types.UnauthorizedQuery{ |  | ||||||
| 				Resource: strings.Split(host, ".")[0], |  | ||||||
| 			} |  | ||||||
|  |  | ||||||
| 			// Use either username or email |  | ||||||
| 			if userContext.OAuth { |  | ||||||
| 				values.Username = userContext.Email |  | ||||||
| 			} else { |  | ||||||
| 				values.Username = userContext.Username |  | ||||||
| 			} |  | ||||||
|  |  | ||||||
| 			// Build query |  | ||||||
| 			queries, err := query.Values(values) |  | ||||||
|  |  | ||||||
| 			// Handle error (no need to check for nginx/headers since we are sure we are using caddy/traefik) |  | ||||||
| 			if err != nil { |  | ||||||
| 				log.Error().Err(err).Msg("Failed to build queries") |  | ||||||
| 				c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 				return |  | ||||||
| 			} |  | ||||||
|  |  | ||||||
| 			// We are using caddy/traefik so redirect |  | ||||||
| 			c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/unauthorized?%s", h.Config.AppURL, queries.Encode())) |  | ||||||
| 			return |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Check groups if using OAuth |  | ||||||
| 		if userContext.OAuth { |  | ||||||
| 			// Check if user is in required groups |  | ||||||
| 			groupOk := h.Auth.OAuthGroup(c, userContext, labels) |  | ||||||
|  |  | ||||||
| 			log.Debug().Bool("groupOk", groupOk).Msg("Checking if user is in required groups") |  | ||||||
|  |  | ||||||
| 			// The user is not allowed to access the app |  | ||||||
| 			if !groupOk { |  | ||||||
| 				log.Warn().Str("username", userContext.Username).Str("host", host).Msg("User is not in required groups") |  | ||||||
|  |  | ||||||
| 				if proxy.Proxy == "nginx" || !isBrowser { |  | ||||||
| 					c.JSON(401, gin.H{ |  | ||||||
| 						"status":  401, |  | ||||||
| 						"message": "Unauthorized", |  | ||||||
| 					}) |  | ||||||
| 					return |  | ||||||
| 				} |  | ||||||
|  |  | ||||||
| 				// Values |  | ||||||
| 				values := types.UnauthorizedQuery{ |  | ||||||
| 					Resource: strings.Split(host, ".")[0], |  | ||||||
| 					GroupErr: true, |  | ||||||
| 				} |  | ||||||
|  |  | ||||||
| 				// Use either username or email |  | ||||||
| 				if userContext.OAuth { |  | ||||||
| 					values.Username = userContext.Email |  | ||||||
| 				} else { |  | ||||||
| 					values.Username = userContext.Username |  | ||||||
| 				} |  | ||||||
|  |  | ||||||
| 				// Build query |  | ||||||
| 				queries, err := query.Values(values) |  | ||||||
|  |  | ||||||
| 				// Handle error (no need to check for nginx/headers since we are sure we are using caddy/traefik) |  | ||||||
| 				if err != nil { |  | ||||||
| 					log.Error().Err(err).Msg("Failed to build queries") |  | ||||||
| 					c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 					return |  | ||||||
| 				} |  | ||||||
|  |  | ||||||
| 				// We are using caddy/traefik so redirect |  | ||||||
| 				c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/unauthorized?%s", h.Config.AppURL, queries.Encode())) |  | ||||||
| 				return |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		c.Header("Remote-User", utils.SanitizeHeader(userContext.Username)) |  | ||||||
| 		c.Header("Remote-Name", utils.SanitizeHeader(userContext.Name)) |  | ||||||
| 		c.Header("Remote-Email", utils.SanitizeHeader(userContext.Email)) |  | ||||||
| 		c.Header("Remote-Groups", utils.SanitizeHeader(userContext.OAuthGroups)) |  | ||||||
|  |  | ||||||
| 		// Set the rest of the headers |  | ||||||
| 		parsedHeaders := utils.ParseHeaders(labels.Headers) |  | ||||||
| 		for key, value := range parsedHeaders { |  | ||||||
| 			log.Debug().Str("key", key).Msg("Setting header") |  | ||||||
| 			c.Header(key, value) |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Set basic auth headers if configured |  | ||||||
| 		if labels.Basic.User != "" && labels.Basic.Password != "" { |  | ||||||
| 			log.Debug().Str("username", labels.Basic.User).Msg("Setting basic auth headers") |  | ||||||
| 			c.Header("Authorization", fmt.Sprintf("Basic %s", utils.GetBasicAuth(labels.Basic.User, labels.Basic.Password))) |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// The user is allowed to access the app |  | ||||||
| 		c.JSON(200, gin.H{ |  | ||||||
| 			"status":  200, |  | ||||||
| 			"message": "Authenticated", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// The user is not logged in |  | ||||||
| 	log.Debug().Msg("Unauthorized") |  | ||||||
|  |  | ||||||
| 	if proxy.Proxy == "nginx" || !isBrowser { |  | ||||||
| 		c.JSON(401, gin.H{ |  | ||||||
| 			"status":  401, |  | ||||||
| 			"message": "Unauthorized", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	queries, err := query.Values(types.LoginQuery{ |  | ||||||
| 		RedirectURI: fmt.Sprintf("%s://%s%s", proto, host, uri), |  | ||||||
| 	}) |  | ||||||
|  |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to build queries") |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Interface("redirect_uri", fmt.Sprintf("%s://%s%s", proto, host, uri)).Msg("Redirecting to login") |  | ||||||
|  |  | ||||||
| 	// Redirect to login |  | ||||||
| 	c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/login?%s", h.Config.AppURL, queries.Encode())) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (h *Handlers) LoginHandler(c *gin.Context) { |  | ||||||
| 	// Create login struct |  | ||||||
| 	var login types.LoginRequest |  | ||||||
|  |  | ||||||
| 	// Bind JSON |  | ||||||
| 	err := c.BindJSON(&login) |  | ||||||
|  |  | ||||||
| 	// Handle error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to bind JSON") |  | ||||||
| 		c.JSON(400, gin.H{ |  | ||||||
| 			"status":  400, |  | ||||||
| 			"message": "Bad Request", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got login request") |  | ||||||
|  |  | ||||||
| 	// Get client IP for rate limiting |  | ||||||
| 	clientIP := c.ClientIP() |  | ||||||
|  |  | ||||||
| 	// Create an identifier for rate limiting (username or IP if username doesn't exist yet) |  | ||||||
| 	rateIdentifier := login.Username |  | ||||||
| 	if rateIdentifier == "" { |  | ||||||
| 		rateIdentifier = clientIP |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check if the account is locked due to too many failed attempts |  | ||||||
| 	locked, remainingTime := h.Auth.IsAccountLocked(rateIdentifier) |  | ||||||
| 	if locked { |  | ||||||
| 		log.Warn().Str("identifier", rateIdentifier).Int("remaining_seconds", remainingTime).Msg("Account is locked due to too many failed login attempts") |  | ||||||
| 		c.JSON(429, gin.H{ |  | ||||||
| 			"status":  429, |  | ||||||
| 			"message": fmt.Sprintf("Too many failed login attempts. Try again in %d seconds", remainingTime), |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Get user based on username |  | ||||||
| 	user := h.Auth.GetUser(login.Username) |  | ||||||
|  |  | ||||||
| 	// User does not exist |  | ||||||
| 	if user == nil { |  | ||||||
| 		log.Debug().Str("username", login.Username).Msg("User not found") |  | ||||||
| 		// Record failed login attempt |  | ||||||
| 		h.Auth.RecordLoginAttempt(rateIdentifier, false) |  | ||||||
| 		c.JSON(401, gin.H{ |  | ||||||
| 			"status":  401, |  | ||||||
| 			"message": "Unauthorized", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got user") |  | ||||||
|  |  | ||||||
| 	// Check if password is correct |  | ||||||
| 	if !h.Auth.CheckPassword(*user, login.Password) { |  | ||||||
| 		log.Debug().Str("username", login.Username).Msg("Password incorrect") |  | ||||||
| 		// Record failed login attempt |  | ||||||
| 		h.Auth.RecordLoginAttempt(rateIdentifier, false) |  | ||||||
| 		c.JSON(401, gin.H{ |  | ||||||
| 			"status":  401, |  | ||||||
| 			"message": "Unauthorized", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Password correct, checking totp") |  | ||||||
|  |  | ||||||
| 	// Record successful login attempt (will reset failed attempt counter) |  | ||||||
| 	h.Auth.RecordLoginAttempt(rateIdentifier, true) |  | ||||||
|  |  | ||||||
| 	// Check if user has totp enabled |  | ||||||
| 	if user.TotpSecret != "" { |  | ||||||
| 		log.Debug().Msg("Totp enabled") |  | ||||||
|  |  | ||||||
| 		// Set totp pending cookie |  | ||||||
| 		h.Auth.CreateSessionCookie(c, &types.SessionCookie{ |  | ||||||
| 			Username:    login.Username, |  | ||||||
| 			Name:        utils.Capitalize(login.Username), |  | ||||||
| 			Email:       fmt.Sprintf("%s@%s", strings.ToLower(login.Username), h.Config.Domain), |  | ||||||
| 			Provider:    "username", |  | ||||||
| 			TotpPending: true, |  | ||||||
| 		}) |  | ||||||
|  |  | ||||||
| 		// Return totp required |  | ||||||
| 		c.JSON(200, gin.H{ |  | ||||||
| 			"status":      200, |  | ||||||
| 			"message":     "Waiting for totp", |  | ||||||
| 			"totpPending": true, |  | ||||||
| 		}) |  | ||||||
|  |  | ||||||
| 		// Stop further processing |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Create session cookie with username as provider |  | ||||||
| 	h.Auth.CreateSessionCookie(c, &types.SessionCookie{ |  | ||||||
| 		Username: login.Username, |  | ||||||
| 		Name:     utils.Capitalize(login.Username), |  | ||||||
| 		Email:    fmt.Sprintf("%s@%s", strings.ToLower(login.Username), h.Config.Domain), |  | ||||||
| 		Provider: "username", |  | ||||||
| 	}) |  | ||||||
|  |  | ||||||
| 	// Return logged in |  | ||||||
| 	c.JSON(200, gin.H{ |  | ||||||
| 		"status":      200, |  | ||||||
| 		"message":     "Logged in", |  | ||||||
| 		"totpPending": false, |  | ||||||
| 	}) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (h *Handlers) TotpHandler(c *gin.Context) { |  | ||||||
| 	// Create totp struct |  | ||||||
| 	var totpReq types.TotpRequest |  | ||||||
|  |  | ||||||
| 	// Bind JSON |  | ||||||
| 	err := c.BindJSON(&totpReq) |  | ||||||
|  |  | ||||||
| 	// Handle error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to bind JSON") |  | ||||||
| 		c.JSON(400, gin.H{ |  | ||||||
| 			"status":  400, |  | ||||||
| 			"message": "Bad Request", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Checking totp") |  | ||||||
|  |  | ||||||
| 	// Get user context |  | ||||||
| 	userContext := h.Hooks.UseUserContext(c) |  | ||||||
|  |  | ||||||
| 	// Check if we have a user |  | ||||||
| 	if userContext.Username == "" { |  | ||||||
| 		log.Debug().Msg("No user context") |  | ||||||
| 		c.JSON(401, gin.H{ |  | ||||||
| 			"status":  401, |  | ||||||
| 			"message": "Unauthorized", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Get user |  | ||||||
| 	user := h.Auth.GetUser(userContext.Username) |  | ||||||
|  |  | ||||||
| 	// Check if user exists |  | ||||||
| 	if user == nil { |  | ||||||
| 		log.Debug().Msg("User not found") |  | ||||||
| 		c.JSON(401, gin.H{ |  | ||||||
| 			"status":  401, |  | ||||||
| 			"message": "Unauthorized", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check if totp is correct |  | ||||||
| 	ok := totp.Validate(totpReq.Code, user.TotpSecret) |  | ||||||
|  |  | ||||||
| 	// TOTP is incorrect |  | ||||||
| 	if !ok { |  | ||||||
| 		log.Debug().Msg("Totp incorrect") |  | ||||||
| 		c.JSON(401, gin.H{ |  | ||||||
| 			"status":  401, |  | ||||||
| 			"message": "Unauthorized", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Totp correct") |  | ||||||
|  |  | ||||||
| 	// Create session cookie with username as provider |  | ||||||
| 	h.Auth.CreateSessionCookie(c, &types.SessionCookie{ |  | ||||||
| 		Username: user.Username, |  | ||||||
| 		Name:     utils.Capitalize(user.Username), |  | ||||||
| 		Email:    fmt.Sprintf("%s@%s", strings.ToLower(user.Username), h.Config.Domain), |  | ||||||
| 		Provider: "username", |  | ||||||
| 	}) |  | ||||||
|  |  | ||||||
| 	// Return logged in |  | ||||||
| 	c.JSON(200, gin.H{ |  | ||||||
| 		"status":  200, |  | ||||||
| 		"message": "Logged in", |  | ||||||
| 	}) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (h *Handlers) LogoutHandler(c *gin.Context) { |  | ||||||
| 	log.Debug().Msg("Logging out") |  | ||||||
|  |  | ||||||
| 	// Delete session cookie |  | ||||||
| 	h.Auth.DeleteSessionCookie(c) |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Cleaning up redirect cookie") |  | ||||||
|  |  | ||||||
| 	// Return logged out |  | ||||||
| 	c.JSON(200, gin.H{ |  | ||||||
| 		"status":  200, |  | ||||||
| 		"message": "Logged out", |  | ||||||
| 	}) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (h *Handlers) AppHandler(c *gin.Context) { |  | ||||||
| 	log.Debug().Msg("Getting app context") |  | ||||||
|  |  | ||||||
| 	// Get configured providers |  | ||||||
| 	configuredProviders := h.Providers.GetConfiguredProviders() |  | ||||||
|  |  | ||||||
| 	// We have username/password configured so add it to our providers |  | ||||||
| 	if h.Auth.UserAuthConfigured() { |  | ||||||
| 		configuredProviders = append(configuredProviders, "username") |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Create app context struct |  | ||||||
| 	appContext := types.AppContext{ |  | ||||||
| 		Status:                200, |  | ||||||
| 		Message:               "OK", |  | ||||||
| 		ConfiguredProviders:   configuredProviders, |  | ||||||
| 		DisableContinue:       h.Config.DisableContinue, |  | ||||||
| 		Title:                 h.Config.Title, |  | ||||||
| 		GenericName:           h.Config.GenericName, |  | ||||||
| 		Domain:                h.Config.Domain, |  | ||||||
| 		ForgotPasswordMessage: h.Config.ForgotPasswordMessage, |  | ||||||
| 		BackgroundImage:       h.Config.BackgroundImage, |  | ||||||
| 		OAuthAutoRedirect:     h.Config.OAuthAutoRedirect, |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Return app context |  | ||||||
| 	c.JSON(200, appContext) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (h *Handlers) UserHandler(c *gin.Context) { |  | ||||||
| 	log.Debug().Msg("Getting user context") |  | ||||||
|  |  | ||||||
| 	// Get user context |  | ||||||
| 	userContext := h.Hooks.UseUserContext(c) |  | ||||||
|  |  | ||||||
| 	// Create user context response |  | ||||||
| 	userContextResponse := types.UserContextResponse{ |  | ||||||
| 		Status:      200, |  | ||||||
| 		IsLoggedIn:  userContext.IsLoggedIn, |  | ||||||
| 		Username:    userContext.Username, |  | ||||||
| 		Name:        userContext.Name, |  | ||||||
| 		Email:       userContext.Email, |  | ||||||
| 		Provider:    userContext.Provider, |  | ||||||
| 		Oauth:       userContext.OAuth, |  | ||||||
| 		TotpPending: userContext.TotpPending, |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// If we are not logged in we set the status to 401 else we set it to 200 |  | ||||||
| 	if !userContext.IsLoggedIn { |  | ||||||
| 		log.Debug().Msg("Unauthorized") |  | ||||||
| 		userContextResponse.Message = "Unauthorized" |  | ||||||
| 	} else { |  | ||||||
| 		log.Debug().Interface("userContext", userContext).Msg("Authenticated") |  | ||||||
| 		userContextResponse.Message = "Authenticated" |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Return user context |  | ||||||
| 	c.JSON(200, userContextResponse) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (h *Handlers) OauthUrlHandler(c *gin.Context) { |  | ||||||
| 	// Create struct for OAuth request |  | ||||||
| 	var request types.OAuthRequest |  | ||||||
|  |  | ||||||
| 	// Bind URI |  | ||||||
| 	err := c.BindUri(&request) |  | ||||||
|  |  | ||||||
| 	// Handle error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to bind URI") |  | ||||||
| 		c.JSON(400, gin.H{ |  | ||||||
| 			"status":  400, |  | ||||||
| 			"message": "Bad Request", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got OAuth request") |  | ||||||
|  |  | ||||||
| 	// Check if provider exists |  | ||||||
| 	provider := h.Providers.GetProvider(request.Provider) |  | ||||||
|  |  | ||||||
| 	// Provider does not exist |  | ||||||
| 	if provider == nil { |  | ||||||
| 		c.JSON(404, gin.H{ |  | ||||||
| 			"status":  404, |  | ||||||
| 			"message": "Not Found", |  | ||||||
| 		}) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Str("provider", request.Provider).Msg("Got provider") |  | ||||||
|  |  | ||||||
| 	// Create state |  | ||||||
| 	state := provider.GenerateState() |  | ||||||
|  |  | ||||||
| 	// Get auth URL |  | ||||||
| 	authURL := provider.GetAuthURL(state) |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got auth URL") |  | ||||||
|  |  | ||||||
| 	// Set CSRF cookie |  | ||||||
| 	c.SetCookie(h.Config.CsrfCookieName, state, int(time.Hour.Seconds()), "/", "", h.Config.CookieSecure, true) |  | ||||||
|  |  | ||||||
| 	// Get redirect URI |  | ||||||
| 	redirectURI := c.Query("redirect_uri") |  | ||||||
|  |  | ||||||
| 	// Set redirect cookie if redirect URI is provided |  | ||||||
| 	if redirectURI != "" { |  | ||||||
| 		log.Debug().Str("redirectURI", redirectURI).Msg("Setting redirect cookie") |  | ||||||
| 		c.SetCookie(h.Config.RedirectCookieName, redirectURI, int(time.Hour.Seconds()), "/", "", h.Config.CookieSecure, true) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Return auth URL |  | ||||||
| 	c.JSON(200, gin.H{ |  | ||||||
| 		"status":  200, |  | ||||||
| 		"message": "OK", |  | ||||||
| 		"url":     authURL, |  | ||||||
| 	}) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (h *Handlers) OauthCallbackHandler(c *gin.Context) { |  | ||||||
| 	// Create struct for OAuth request |  | ||||||
| 	var providerName types.OAuthRequest |  | ||||||
|  |  | ||||||
| 	// Bind URI |  | ||||||
| 	err := c.BindUri(&providerName) |  | ||||||
|  |  | ||||||
| 	// Handle error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to bind URI") |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Interface("provider", providerName.Provider).Msg("Got provider name") |  | ||||||
|  |  | ||||||
| 	// Get state |  | ||||||
| 	state := c.Query("state") |  | ||||||
|  |  | ||||||
| 	// Get CSRF cookie |  | ||||||
| 	csrfCookie, err := c.Cookie(h.Config.CsrfCookieName) |  | ||||||
|  |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Debug().Msg("No CSRF cookie") |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Str("csrfCookie", csrfCookie).Msg("Got CSRF cookie") |  | ||||||
|  |  | ||||||
| 	// Check if CSRF cookie is valid |  | ||||||
| 	if csrfCookie != state { |  | ||||||
| 		log.Warn().Msg("Invalid CSRF cookie or CSRF cookie does not match with the state") |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Clean up CSRF cookie |  | ||||||
| 	c.SetCookie(h.Config.CsrfCookieName, "", -1, "/", "", h.Config.CookieSecure, true) |  | ||||||
|  |  | ||||||
| 	// Get code |  | ||||||
| 	code := c.Query("code") |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got code") |  | ||||||
|  |  | ||||||
| 	// Get provider |  | ||||||
| 	provider := h.Providers.GetProvider(providerName.Provider) |  | ||||||
|  |  | ||||||
| 	log.Debug().Str("provider", providerName.Provider).Msg("Got provider") |  | ||||||
|  |  | ||||||
| 	// Provider does not exist |  | ||||||
| 	if provider == nil { |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, "/not-found") |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Exchange token (authenticates user) |  | ||||||
| 	_, err = provider.ExchangeToken(code) |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got token") |  | ||||||
|  |  | ||||||
| 	// Handle error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to exchange token") |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Get user |  | ||||||
| 	user, err := h.Providers.GetUser(providerName.Provider) |  | ||||||
|  |  | ||||||
| 	// Handle error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Msg("Failed to get user") |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got user") |  | ||||||
|  |  | ||||||
| 	// Check that email is not empty |  | ||||||
| 	if user.Email == "" { |  | ||||||
| 		log.Error().Msg("Email is empty") |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Email is not whitelisted |  | ||||||
| 	if !h.Auth.EmailWhitelisted(user.Email) { |  | ||||||
| 		log.Warn().Str("email", user.Email).Msg("Email not whitelisted") |  | ||||||
|  |  | ||||||
| 		// Build query |  | ||||||
| 		queries, err := query.Values(types.UnauthorizedQuery{ |  | ||||||
| 			Username: user.Email, |  | ||||||
| 		}) |  | ||||||
|  |  | ||||||
| 		// Handle error |  | ||||||
| 		if err != nil { |  | ||||||
| 			log.Error().Err(err).Msg("Failed to build queries") |  | ||||||
| 			c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 			return |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Redirect to unauthorized |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/unauthorized?%s", h.Config.AppURL, queries.Encode())) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Email whitelisted") |  | ||||||
|  |  | ||||||
| 	// Get username |  | ||||||
| 	var username string |  | ||||||
|  |  | ||||||
| 	if user.PreferredUsername != "" { |  | ||||||
| 		username = user.PreferredUsername |  | ||||||
| 	} else { |  | ||||||
| 		username = fmt.Sprintf("%s_%s", strings.Split(user.Email, "@")[0], strings.Split(user.Email, "@")[1]) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Get name |  | ||||||
| 	var name string |  | ||||||
|  |  | ||||||
| 	if user.Name != "" { |  | ||||||
| 		name = user.Name |  | ||||||
| 	} else { |  | ||||||
| 		name = fmt.Sprintf("%s (%s)", utils.Capitalize(strings.Split(user.Email, "@")[0]), strings.Split(user.Email, "@")[1]) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Create session cookie (also cleans up redirect cookie) |  | ||||||
| 	h.Auth.CreateSessionCookie(c, &types.SessionCookie{ |  | ||||||
| 		Username:    username, |  | ||||||
| 		Name:        name, |  | ||||||
| 		Email:       user.Email, |  | ||||||
| 		Provider:    providerName.Provider, |  | ||||||
| 		OAuthGroups: strings.Join(user.Groups, ","), |  | ||||||
| 	}) |  | ||||||
|  |  | ||||||
| 	// Check if we have a redirect URI |  | ||||||
| 	redirectCookie, err := c.Cookie(h.Config.RedirectCookieName) |  | ||||||
|  |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Debug().Msg("No redirect cookie") |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, h.Config.AppURL) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Str("redirectURI", redirectCookie).Msg("Got redirect URI") |  | ||||||
|  |  | ||||||
| 	// Build query |  | ||||||
| 	queries, err := query.Values(types.LoginQuery{ |  | ||||||
| 		RedirectURI: redirectCookie, |  | ||||||
| 	}) |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got redirect query") |  | ||||||
|  |  | ||||||
| 	// Handle error |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to build queries") |  | ||||||
| 		c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/error", h.Config.AppURL)) |  | ||||||
| 		return |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Clean up redirect cookie |  | ||||||
| 	c.SetCookie(h.Config.RedirectCookieName, "", -1, "/", "", h.Config.CookieSecure, true) |  | ||||||
|  |  | ||||||
| 	// Redirect to continue with the redirect URI |  | ||||||
| 	c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s/continue?%s", h.Config.AppURL, queries.Encode())) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (h *Handlers) HealthcheckHandler(c *gin.Context) { |  | ||||||
| 	c.JSON(200, gin.H{ |  | ||||||
| 		"status":  200, |  | ||||||
| 		"message": "OK", |  | ||||||
| 	}) |  | ||||||
| } |  | ||||||
| @@ -1,139 +0,0 @@ | |||||||
| package hooks |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"fmt" |  | ||||||
| 	"strings" |  | ||||||
| 	"tinyauth/internal/auth" |  | ||||||
| 	"tinyauth/internal/providers" |  | ||||||
| 	"tinyauth/internal/types" |  | ||||||
| 	"tinyauth/internal/utils" |  | ||||||
|  |  | ||||||
| 	"github.com/gin-gonic/gin" |  | ||||||
| 	"github.com/rs/zerolog/log" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| type Hooks struct { |  | ||||||
| 	Config    types.HooksConfig |  | ||||||
| 	Auth      *auth.Auth |  | ||||||
| 	Providers *providers.Providers |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func NewHooks(config types.HooksConfig, auth *auth.Auth, providers *providers.Providers) *Hooks { |  | ||||||
| 	return &Hooks{ |  | ||||||
| 		Config:    config, |  | ||||||
| 		Auth:      auth, |  | ||||||
| 		Providers: providers, |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (hooks *Hooks) UseUserContext(c *gin.Context) types.UserContext { |  | ||||||
| 	// Get session cookie and basic auth |  | ||||||
| 	cookie, err := hooks.Auth.GetSessionCookie(c) |  | ||||||
| 	basic := hooks.Auth.GetBasicAuth(c) |  | ||||||
|  |  | ||||||
| 	// Check if basic auth is set |  | ||||||
| 	if basic != nil { |  | ||||||
| 		log.Debug().Msg("Got basic auth") |  | ||||||
|  |  | ||||||
| 		// Get user |  | ||||||
| 		user := hooks.Auth.GetUser(basic.Username) |  | ||||||
|  |  | ||||||
| 		// Check we have a user |  | ||||||
| 		if user == nil { |  | ||||||
| 			log.Error().Str("username", basic.Username).Msg("User does not exist") |  | ||||||
|  |  | ||||||
| 			// Return empty context |  | ||||||
| 			return types.UserContext{} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Check if the user has a correct password |  | ||||||
| 		if hooks.Auth.CheckPassword(*user, basic.Password) { |  | ||||||
| 			// Return user context since we are logged in with basic auth |  | ||||||
| 			return types.UserContext{ |  | ||||||
| 				Username:    basic.Username, |  | ||||||
| 				Name:        utils.Capitalize(basic.Username), |  | ||||||
| 				Email:       fmt.Sprintf("%s@%s", strings.ToLower(basic.Username), hooks.Config.Domain), |  | ||||||
| 				IsLoggedIn:  true, |  | ||||||
| 				Provider:    "basic", |  | ||||||
| 				TotpEnabled: user.TotpSecret != "", |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check cookie error after basic auth |  | ||||||
| 	if err != nil { |  | ||||||
| 		log.Error().Err(err).Msg("Failed to get session cookie") |  | ||||||
| 		// Return empty context |  | ||||||
| 		return types.UserContext{} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check if session cookie has totp pending |  | ||||||
| 	if cookie.TotpPending { |  | ||||||
| 		log.Debug().Msg("Totp pending") |  | ||||||
| 		// Return empty context since we are pending totp |  | ||||||
| 		return types.UserContext{ |  | ||||||
| 			Username:    cookie.Username, |  | ||||||
| 			Name:        cookie.Name, |  | ||||||
| 			Email:       cookie.Email, |  | ||||||
| 			Provider:    cookie.Provider, |  | ||||||
| 			TotpPending: true, |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Check if session cookie is username/password auth |  | ||||||
| 	if cookie.Provider == "username" { |  | ||||||
| 		log.Debug().Msg("Provider is username") |  | ||||||
|  |  | ||||||
| 		// Check if user exists |  | ||||||
| 		if hooks.Auth.GetUser(cookie.Username) != nil { |  | ||||||
| 			log.Debug().Msg("User exists") |  | ||||||
|  |  | ||||||
| 			// It exists so we are logged in |  | ||||||
| 			return types.UserContext{ |  | ||||||
| 				Username:   cookie.Username, |  | ||||||
| 				Name:       cookie.Name, |  | ||||||
| 				Email:      cookie.Email, |  | ||||||
| 				IsLoggedIn: true, |  | ||||||
| 				Provider:   "username", |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Provider is not username") |  | ||||||
|  |  | ||||||
| 	// The provider is not username so we need to check if it is an oauth provider |  | ||||||
| 	provider := hooks.Providers.GetProvider(cookie.Provider) |  | ||||||
|  |  | ||||||
| 	// If we have a provider with this name |  | ||||||
| 	if provider != nil { |  | ||||||
| 		log.Debug().Msg("Provider exists") |  | ||||||
|  |  | ||||||
| 		// Check if the oauth email is whitelisted |  | ||||||
| 		if !hooks.Auth.EmailWhitelisted(cookie.Email) { |  | ||||||
| 			log.Error().Str("email", cookie.Email).Msg("Email is not whitelisted") |  | ||||||
|  |  | ||||||
| 			// It isn't so we delete the cookie and return an empty context |  | ||||||
| 			hooks.Auth.DeleteSessionCookie(c) |  | ||||||
|  |  | ||||||
| 			// Return empty context |  | ||||||
| 			return types.UserContext{} |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		log.Debug().Msg("Email is whitelisted") |  | ||||||
|  |  | ||||||
| 		// Return user context since we are logged in with oauth |  | ||||||
| 		return types.UserContext{ |  | ||||||
| 			Username:    cookie.Username, |  | ||||||
| 			Name:        cookie.Name, |  | ||||||
| 			Email:       cookie.Email, |  | ||||||
| 			IsLoggedIn:  true, |  | ||||||
| 			OAuth:       true, |  | ||||||
| 			Provider:    cookie.Provider, |  | ||||||
| 			OAuthGroups: cookie.OAuthGroups, |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Neither basic auth or oauth is set so we return an empty context |  | ||||||
| 	return types.UserContext{} |  | ||||||
| } |  | ||||||
							
								
								
									
										159
									
								
								internal/middleware/context_middleware.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										159
									
								
								internal/middleware/context_middleware.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,159 @@ | |||||||
|  | package middleware | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"fmt" | ||||||
|  | 	"strings" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  | 	"tinyauth/internal/service" | ||||||
|  | 	"tinyauth/internal/utils" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type ContextMiddlewareConfig struct { | ||||||
|  | 	Domain string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type ContextMiddleware struct { | ||||||
|  | 	Config ContextMiddlewareConfig | ||||||
|  | 	Auth   *service.AuthService | ||||||
|  | 	Broker *service.OAuthBrokerService | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewContextMiddleware(config ContextMiddlewareConfig, auth *service.AuthService, broker *service.OAuthBrokerService) *ContextMiddleware { | ||||||
|  | 	return &ContextMiddleware{ | ||||||
|  | 		Config: config, | ||||||
|  | 		Auth:   auth, | ||||||
|  | 		Broker: broker, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (m *ContextMiddleware) Init() error { | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (m *ContextMiddleware) Middleware() gin.HandlerFunc { | ||||||
|  | 	return func(c *gin.Context) { | ||||||
|  | 		cookie, err := m.Auth.GetSessionCookie(c) | ||||||
|  |  | ||||||
|  | 		if err != nil { | ||||||
|  | 			log.Debug().Err(err).Msg("No valid session cookie found") | ||||||
|  | 			goto basic | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if cookie.TotpPending { | ||||||
|  | 			c.Set("context", &config.UserContext{ | ||||||
|  | 				Username:    cookie.Username, | ||||||
|  | 				Name:        cookie.Name, | ||||||
|  | 				Email:       cookie.Email, | ||||||
|  | 				Provider:    "username", | ||||||
|  | 				TotpPending: true, | ||||||
|  | 				TotpEnabled: true, | ||||||
|  | 			}) | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		switch cookie.Provider { | ||||||
|  | 		case "username": | ||||||
|  | 			userSearch := m.Auth.SearchUser(cookie.Username) | ||||||
|  |  | ||||||
|  | 			if userSearch.Type == "unknown" { | ||||||
|  | 				log.Debug().Msg("User from session cookie not found") | ||||||
|  | 				m.Auth.DeleteSessionCookie(c) | ||||||
|  | 				goto basic | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			c.Set("context", &config.UserContext{ | ||||||
|  | 				Username:   cookie.Username, | ||||||
|  | 				Name:       cookie.Name, | ||||||
|  | 				Email:      cookie.Email, | ||||||
|  | 				Provider:   "username", | ||||||
|  | 				IsLoggedIn: true, | ||||||
|  | 			}) | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		default: | ||||||
|  | 			_, exists := m.Broker.GetService(cookie.Provider) | ||||||
|  |  | ||||||
|  | 			if !exists { | ||||||
|  | 				log.Debug().Msg("OAuth provider from session cookie not found") | ||||||
|  | 				m.Auth.DeleteSessionCookie(c) | ||||||
|  | 				goto basic | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			if !m.Auth.EmailWhitelisted(cookie.Email) { | ||||||
|  | 				log.Debug().Msg("Email from session cookie not whitelisted") | ||||||
|  | 				m.Auth.DeleteSessionCookie(c) | ||||||
|  | 				goto basic | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			c.Set("context", &config.UserContext{ | ||||||
|  | 				Username:    cookie.Username, | ||||||
|  | 				Name:        cookie.Name, | ||||||
|  | 				Email:       cookie.Email, | ||||||
|  | 				Provider:    cookie.Provider, | ||||||
|  | 				OAuthGroups: cookie.OAuthGroups, | ||||||
|  | 				IsLoggedIn:  true, | ||||||
|  | 				OAuth:       true, | ||||||
|  | 			}) | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 	basic: | ||||||
|  | 		basic := m.Auth.GetBasicAuth(c) | ||||||
|  |  | ||||||
|  | 		if basic == nil { | ||||||
|  | 			log.Debug().Msg("No basic auth provided") | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		userSearch := m.Auth.SearchUser(basic.Username) | ||||||
|  |  | ||||||
|  | 		if userSearch.Type == "unknown" { | ||||||
|  | 			log.Debug().Msg("User from basic auth not found") | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if !m.Auth.VerifyUser(userSearch, basic.Password) { | ||||||
|  | 			log.Debug().Msg("Invalid password for basic auth user") | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		switch userSearch.Type { | ||||||
|  | 		case "local": | ||||||
|  | 			log.Debug().Msg("Basic auth user is local") | ||||||
|  |  | ||||||
|  | 			user := m.Auth.GetLocalUser(basic.Username) | ||||||
|  |  | ||||||
|  | 			c.Set("context", &config.UserContext{ | ||||||
|  | 				Username:    user.Username, | ||||||
|  | 				Name:        utils.Capitalize(user.Username), | ||||||
|  | 				Email:       fmt.Sprintf("%s@%s", strings.ToLower(user.Username), m.Config.Domain), | ||||||
|  | 				Provider:    "basic", | ||||||
|  | 				IsLoggedIn:  true, | ||||||
|  | 				TotpEnabled: user.TotpSecret != "", | ||||||
|  | 			}) | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		case "ldap": | ||||||
|  | 			log.Debug().Msg("Basic auth user is LDAP") | ||||||
|  | 			c.Set("context", &config.UserContext{ | ||||||
|  | 				Username:   basic.Username, | ||||||
|  | 				Name:       utils.Capitalize(basic.Username), | ||||||
|  | 				Email:      fmt.Sprintf("%s@%s", strings.ToLower(basic.Username), m.Config.Domain), | ||||||
|  | 				Provider:   "basic", | ||||||
|  | 				IsLoggedIn: true, | ||||||
|  | 			}) | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		c.Next() | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										56
									
								
								internal/middleware/ui_middleware.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								internal/middleware/ui_middleware.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,56 @@ | |||||||
|  | package middleware | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"io/fs" | ||||||
|  | 	"net/http" | ||||||
|  | 	"os" | ||||||
|  | 	"strings" | ||||||
|  | 	"tinyauth/internal/assets" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type UIMiddleware struct { | ||||||
|  | 	UIFS         fs.FS | ||||||
|  | 	UIFileServer http.Handler | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewUIMiddleware() *UIMiddleware { | ||||||
|  | 	return &UIMiddleware{} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (m *UIMiddleware) Init() error { | ||||||
|  | 	ui, err := fs.Sub(assets.FrontendAssets, "dist") | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	m.UIFS = ui | ||||||
|  | 	m.UIFileServer = http.FileServer(http.FS(ui)) | ||||||
|  |  | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (m *UIMiddleware) Middleware() gin.HandlerFunc { | ||||||
|  | 	return func(c *gin.Context) { | ||||||
|  | 		switch strings.Split(c.Request.URL.Path, "/")[1] { | ||||||
|  | 		case "api": | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		case "resources": | ||||||
|  | 			c.Next() | ||||||
|  | 			return | ||||||
|  | 		default: | ||||||
|  | 			_, err := fs.Stat(m.UIFS, strings.TrimPrefix(c.Request.URL.Path, "/")) | ||||||
|  |  | ||||||
|  | 			if os.IsNotExist(err) { | ||||||
|  | 				c.Request.URL.Path = "/" | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			m.UIFileServer.ServeHTTP(c.Writer, c.Request) | ||||||
|  | 			c.Abort() | ||||||
|  | 			return | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										66
									
								
								internal/middleware/zerolog_middleware.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								internal/middleware/zerolog_middleware.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,66 @@ | |||||||
|  | package middleware | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"strings" | ||||||
|  | 	"time" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | var ( | ||||||
|  | 	loggerSkipPathsPrefix = []string{ | ||||||
|  | 		"GET /api/health", | ||||||
|  | 		"HEAD /api/health", | ||||||
|  | 		"GET /favicon.ico", | ||||||
|  | 	} | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type ZerologMiddleware struct{} | ||||||
|  |  | ||||||
|  | func NewZerologMiddleware() *ZerologMiddleware { | ||||||
|  | 	return &ZerologMiddleware{} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (m *ZerologMiddleware) Init() error { | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (m *ZerologMiddleware) logPath(path string) bool { | ||||||
|  | 	for _, prefix := range loggerSkipPathsPrefix { | ||||||
|  | 		if strings.HasPrefix(path, prefix) { | ||||||
|  | 			return false | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 	return true | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (m *ZerologMiddleware) Middleware() gin.HandlerFunc { | ||||||
|  | 	return func(c *gin.Context) { | ||||||
|  | 		tStart := time.Now() | ||||||
|  |  | ||||||
|  | 		c.Next() | ||||||
|  |  | ||||||
|  | 		code := c.Writer.Status() | ||||||
|  | 		address := c.Request.RemoteAddr | ||||||
|  | 		clientIP := c.ClientIP() | ||||||
|  | 		method := c.Request.Method | ||||||
|  | 		path := c.Request.URL.Path | ||||||
|  |  | ||||||
|  | 		latency := time.Since(tStart).String() | ||||||
|  |  | ||||||
|  | 		// logPath check if the path should be logged normally or with debug | ||||||
|  | 		if m.logPath(method + " " + path) { | ||||||
|  | 			switch { | ||||||
|  | 			case code >= 200 && code < 300: | ||||||
|  | 				log.Info().Str("method", method).Str("path", path).Str("address", address).Str("clientIp", clientIP).Int("status", code).Str("latency", latency).Msg("Request") | ||||||
|  | 			case code >= 300 && code < 400: | ||||||
|  | 				log.Warn().Str("method", method).Str("path", path).Str("address", address).Str("clientIp", clientIP).Int("status", code).Str("latency", latency).Msg("Request") | ||||||
|  | 			case code >= 400: | ||||||
|  | 				log.Error().Str("method", method).Str("path", path).Str("address", address).Str("clientIp", clientIP).Int("status", code).Str("latency", latency).Msg("Request") | ||||||
|  | 			} | ||||||
|  | 		} else { | ||||||
|  | 			log.Debug().Str("method", method).Str("path", path).Str("address", address).Int("status", code).Str("latency", latency).Msg("Request") | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | } | ||||||
| @@ -1,87 +0,0 @@ | |||||||
| package oauth |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"context" |  | ||||||
| 	"crypto/rand" |  | ||||||
| 	"crypto/tls" |  | ||||||
| 	"encoding/base64" |  | ||||||
| 	"net/http" |  | ||||||
|  |  | ||||||
| 	"golang.org/x/oauth2" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| type OAuth struct { |  | ||||||
| 	Config   oauth2.Config |  | ||||||
| 	Context  context.Context |  | ||||||
| 	Token    *oauth2.Token |  | ||||||
| 	Verifier string |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func NewOAuth(config oauth2.Config, insecureSkipVerify bool) *OAuth { |  | ||||||
| 	// Create transport with TLS |  | ||||||
| 	transport := &http.Transport{ |  | ||||||
| 		TLSClientConfig: &tls.Config{ |  | ||||||
| 			InsecureSkipVerify: insecureSkipVerify, |  | ||||||
| 			MinVersion:         tls.VersionTLS12, |  | ||||||
| 		}, |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Create a new context |  | ||||||
| 	ctx := context.Background() |  | ||||||
|  |  | ||||||
| 	// Create the HTTP client with the transport |  | ||||||
| 	httpClient := &http.Client{ |  | ||||||
| 		Transport: transport, |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Set the HTTP client in the context |  | ||||||
| 	ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient) |  | ||||||
|  |  | ||||||
| 	// Create the verifier |  | ||||||
| 	verifier := oauth2.GenerateVerifier() |  | ||||||
|  |  | ||||||
| 	return &OAuth{ |  | ||||||
| 		Config:   config, |  | ||||||
| 		Context:  ctx, |  | ||||||
| 		Verifier: verifier, |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (oauth *OAuth) GetAuthURL(state string) string { |  | ||||||
| 	// Return the auth url |  | ||||||
| 	return oauth.Config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(oauth.Verifier)) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (oauth *OAuth) ExchangeToken(code string) (string, error) { |  | ||||||
| 	// Exchange the code for a token |  | ||||||
| 	token, err := oauth.Config.Exchange(oauth.Context, code, oauth2.VerifierOption(oauth.Verifier)) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return "", err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Set the token |  | ||||||
| 	oauth.Token = token |  | ||||||
|  |  | ||||||
| 	// Return the access token |  | ||||||
| 	return oauth.Token.AccessToken, nil |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (oauth *OAuth) GetClient() *http.Client { |  | ||||||
| 	// Return the http client with the token set |  | ||||||
| 	return oauth.Config.Client(oauth.Context, oauth.Token) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (oauth *OAuth) GenerateState() string { |  | ||||||
| 	// Generate a random state string |  | ||||||
| 	b := make([]byte, 128) |  | ||||||
|  |  | ||||||
| 	// Fill the byte slice with random data |  | ||||||
| 	rand.Read(b) |  | ||||||
|  |  | ||||||
| 	// Encode the byte slice to a base64 string |  | ||||||
| 	state := base64.URLEncoding.EncodeToString(b) |  | ||||||
|  |  | ||||||
| 	return state |  | ||||||
| } |  | ||||||
| @@ -1,50 +0,0 @@ | |||||||
| package providers |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"encoding/json" |  | ||||||
| 	"io" |  | ||||||
| 	"net/http" |  | ||||||
| 	"tinyauth/internal/constants" |  | ||||||
|  |  | ||||||
| 	"github.com/rs/zerolog/log" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| func GetGenericUser(client *http.Client, url string) (constants.Claims, error) { |  | ||||||
| 	// Create user struct |  | ||||||
| 	var user constants.Claims |  | ||||||
|  |  | ||||||
| 	// Using the oauth client get the user info url |  | ||||||
| 	res, err := client.Get(url) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	defer res.Body.Close() |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got response from generic provider") |  | ||||||
|  |  | ||||||
| 	// Read the body of the response |  | ||||||
| 	body, err := io.ReadAll(res.Body) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Read body from generic provider") |  | ||||||
|  |  | ||||||
| 	// Unmarshal the body into the user struct |  | ||||||
| 	err = json.Unmarshal(body, &user) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Parsed user from generic provider") |  | ||||||
|  |  | ||||||
| 	// Return the user |  | ||||||
| 	return user, nil |  | ||||||
| } |  | ||||||
| @@ -1,129 +0,0 @@ | |||||||
| package providers |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"encoding/json" |  | ||||||
| 	"errors" |  | ||||||
| 	"io" |  | ||||||
| 	"net/http" |  | ||||||
| 	"tinyauth/internal/constants" |  | ||||||
|  |  | ||||||
| 	"github.com/rs/zerolog/log" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| // Response for the github email endpoint |  | ||||||
| type GithubEmailResponse []struct { |  | ||||||
| 	Email   string `json:"email"` |  | ||||||
| 	Primary bool   `json:"primary"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Response for the github user endpoint |  | ||||||
| type GithubUserInfoResponse struct { |  | ||||||
| 	Login string `json:"login"` |  | ||||||
| 	Name  string `json:"name"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // The scopes required for the github provider |  | ||||||
| func GithubScopes() []string { |  | ||||||
| 	return []string{"user:email", "read:user"} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func GetGithubUser(client *http.Client) (constants.Claims, error) { |  | ||||||
| 	// Create user struct |  | ||||||
| 	var user constants.Claims |  | ||||||
|  |  | ||||||
| 	// Get the user info from github using the oauth http client |  | ||||||
| 	res, err := client.Get("https://api.github.com/user") |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	defer res.Body.Close() |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got user response from github") |  | ||||||
|  |  | ||||||
| 	// Read the body of the response |  | ||||||
| 	body, err := io.ReadAll(res.Body) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Read user body from github") |  | ||||||
|  |  | ||||||
| 	// Parse the body into a user struct |  | ||||||
| 	var userInfo GithubUserInfoResponse |  | ||||||
|  |  | ||||||
| 	// Unmarshal the body into the user struct |  | ||||||
| 	err = json.Unmarshal(body, &userInfo) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Get the user emails from github using the oauth http client |  | ||||||
| 	res, err = client.Get("https://api.github.com/user/emails") |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	defer res.Body.Close() |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got email response from github") |  | ||||||
|  |  | ||||||
| 	// Read the body of the response |  | ||||||
| 	body, err = io.ReadAll(res.Body) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Read email body from github") |  | ||||||
|  |  | ||||||
| 	// Parse the body into a user struct |  | ||||||
| 	var emails GithubEmailResponse |  | ||||||
|  |  | ||||||
| 	// Unmarshal the body into the user struct |  | ||||||
| 	err = json.Unmarshal(body, &emails) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Parsed emails from github") |  | ||||||
|  |  | ||||||
| 	// Find and return the primary email |  | ||||||
| 	for _, email := range emails { |  | ||||||
| 		if email.Primary { |  | ||||||
| 			// Set the email then exit |  | ||||||
| 			log.Debug().Str("email", email.Email).Msg("Found primary email") |  | ||||||
| 			user.Email = email.Email |  | ||||||
| 			break |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// If no primary email was found, use the first available email |  | ||||||
| 	if len(emails) == 0 { |  | ||||||
| 		return user, errors.New("no emails found") |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Set the email if it is not set picking the first one |  | ||||||
| 	if user.Email == "" { |  | ||||||
| 		log.Warn().Str("email", emails[0].Email).Msg("No primary email found, using first email") |  | ||||||
| 		user.Email = emails[0].Email |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Set the username and name |  | ||||||
| 	user.PreferredUsername = userInfo.Login |  | ||||||
| 	user.Name = userInfo.Name |  | ||||||
|  |  | ||||||
| 	// Return |  | ||||||
| 	return user, nil |  | ||||||
| } |  | ||||||
| @@ -1,70 +0,0 @@ | |||||||
| package providers |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"encoding/json" |  | ||||||
| 	"io" |  | ||||||
| 	"net/http" |  | ||||||
| 	"strings" |  | ||||||
| 	"tinyauth/internal/constants" |  | ||||||
|  |  | ||||||
| 	"github.com/rs/zerolog/log" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| // Response for the google user endpoint |  | ||||||
| type GoogleUserInfoResponse struct { |  | ||||||
| 	Email string `json:"email"` |  | ||||||
| 	Name  string `json:"name"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // The scopes required for the google provider |  | ||||||
| func GoogleScopes() []string { |  | ||||||
| 	return []string{"https://www.googleapis.com/auth/userinfo.email", "https://www.googleapis.com/auth/userinfo.profile"} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func GetGoogleUser(client *http.Client) (constants.Claims, error) { |  | ||||||
| 	// Create user struct |  | ||||||
| 	var user constants.Claims |  | ||||||
|  |  | ||||||
| 	// Get the user info from google using the oauth http client |  | ||||||
| 	res, err := client.Get("https://www.googleapis.com/userinfo/v2/me") |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	defer res.Body.Close() |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Got response from google") |  | ||||||
|  |  | ||||||
| 	// Read the body of the response |  | ||||||
| 	body, err := io.ReadAll(res.Body) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Read body from google") |  | ||||||
|  |  | ||||||
| 	// Create a new user info struct |  | ||||||
| 	var userInfo GoogleUserInfoResponse |  | ||||||
|  |  | ||||||
| 	// Unmarshal the body into the user struct |  | ||||||
| 	err = json.Unmarshal(body, &userInfo) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		return user, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	log.Debug().Msg("Parsed user from google") |  | ||||||
|  |  | ||||||
| 	// Map the user info to the user struct |  | ||||||
| 	user.PreferredUsername = strings.Split(userInfo.Email, "@")[0] |  | ||||||
| 	user.Name = userInfo.Name |  | ||||||
| 	user.Email = userInfo.Email |  | ||||||
|  |  | ||||||
| 	// Return the user |  | ||||||
| 	return user, nil |  | ||||||
| } |  | ||||||
| @@ -1,184 +0,0 @@ | |||||||
| package providers |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"fmt" |  | ||||||
| 	"tinyauth/internal/constants" |  | ||||||
| 	"tinyauth/internal/oauth" |  | ||||||
| 	"tinyauth/internal/types" |  | ||||||
|  |  | ||||||
| 	"github.com/rs/zerolog/log" |  | ||||||
| 	"golang.org/x/oauth2" |  | ||||||
| 	"golang.org/x/oauth2/endpoints" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| type Providers struct { |  | ||||||
| 	Config  types.OAuthConfig |  | ||||||
| 	Github  *oauth.OAuth |  | ||||||
| 	Google  *oauth.OAuth |  | ||||||
| 	Generic *oauth.OAuth |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func NewProviders(config types.OAuthConfig) *Providers { |  | ||||||
| 	providers := &Providers{ |  | ||||||
| 		Config: config, |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// If we have a client id and secret for github, initialize the oauth provider |  | ||||||
| 	if config.GithubClientId != "" && config.GithubClientSecret != "" { |  | ||||||
| 		log.Info().Msg("Initializing Github OAuth") |  | ||||||
|  |  | ||||||
| 		// Create a new oauth provider with the github config |  | ||||||
| 		providers.Github = oauth.NewOAuth(oauth2.Config{ |  | ||||||
| 			ClientID:     config.GithubClientId, |  | ||||||
| 			ClientSecret: config.GithubClientSecret, |  | ||||||
| 			RedirectURL:  fmt.Sprintf("%s/api/oauth/callback/github", config.AppURL), |  | ||||||
| 			Scopes:       GithubScopes(), |  | ||||||
| 			Endpoint:     endpoints.GitHub, |  | ||||||
| 		}, false) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// If we have a client id and secret for google, initialize the oauth provider |  | ||||||
| 	if config.GoogleClientId != "" && config.GoogleClientSecret != "" { |  | ||||||
| 		log.Info().Msg("Initializing Google OAuth") |  | ||||||
|  |  | ||||||
| 		// Create a new oauth provider with the google config |  | ||||||
| 		providers.Google = oauth.NewOAuth(oauth2.Config{ |  | ||||||
| 			ClientID:     config.GoogleClientId, |  | ||||||
| 			ClientSecret: config.GoogleClientSecret, |  | ||||||
| 			RedirectURL:  fmt.Sprintf("%s/api/oauth/callback/google", config.AppURL), |  | ||||||
| 			Scopes:       GoogleScopes(), |  | ||||||
| 			Endpoint:     endpoints.Google, |  | ||||||
| 		}, false) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// If we have a client id and secret for generic oauth, initialize the oauth provider |  | ||||||
| 	if config.GenericClientId != "" && config.GenericClientSecret != "" { |  | ||||||
| 		log.Info().Msg("Initializing Generic OAuth") |  | ||||||
|  |  | ||||||
| 		// Create a new oauth provider with the generic config |  | ||||||
| 		providers.Generic = oauth.NewOAuth(oauth2.Config{ |  | ||||||
| 			ClientID:     config.GenericClientId, |  | ||||||
| 			ClientSecret: config.GenericClientSecret, |  | ||||||
| 			RedirectURL:  fmt.Sprintf("%s/api/oauth/callback/generic", config.AppURL), |  | ||||||
| 			Scopes:       config.GenericScopes, |  | ||||||
| 			Endpoint: oauth2.Endpoint{ |  | ||||||
| 				AuthURL:  config.GenericAuthURL, |  | ||||||
| 				TokenURL: config.GenericTokenURL, |  | ||||||
| 			}, |  | ||||||
| 		}, config.GenericSkipSSL) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	return providers |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (providers *Providers) GetProvider(provider string) *oauth.OAuth { |  | ||||||
| 	// Return the provider based on the provider string |  | ||||||
| 	switch provider { |  | ||||||
| 	case "github": |  | ||||||
| 		return providers.Github |  | ||||||
| 	case "google": |  | ||||||
| 		return providers.Google |  | ||||||
| 	case "generic": |  | ||||||
| 		return providers.Generic |  | ||||||
| 	default: |  | ||||||
| 		return nil |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (providers *Providers) GetUser(provider string) (constants.Claims, error) { |  | ||||||
| 	// Create user struct |  | ||||||
| 	var user constants.Claims |  | ||||||
|  |  | ||||||
| 	// Get the user from the provider |  | ||||||
| 	switch provider { |  | ||||||
| 	case "github": |  | ||||||
| 		// If the github provider is not configured, return an error |  | ||||||
| 		if providers.Github == nil { |  | ||||||
| 			log.Debug().Msg("Github provider not configured") |  | ||||||
| 			return user, nil |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Get the client from the github provider |  | ||||||
| 		client := providers.Github.GetClient() |  | ||||||
|  |  | ||||||
| 		log.Debug().Msg("Got client from github") |  | ||||||
|  |  | ||||||
| 		// Get the user from the github provider |  | ||||||
| 		user, err := GetGithubUser(client) |  | ||||||
|  |  | ||||||
| 		// Check if there was an error |  | ||||||
| 		if err != nil { |  | ||||||
| 			return user, err |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		log.Debug().Msg("Got user from github") |  | ||||||
|  |  | ||||||
| 		// Return the user |  | ||||||
| 		return user, nil |  | ||||||
| 	case "google": |  | ||||||
| 		// If the google provider is not configured, return an error |  | ||||||
| 		if providers.Google == nil { |  | ||||||
| 			log.Debug().Msg("Google provider not configured") |  | ||||||
| 			return user, nil |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Get the client from the google provider |  | ||||||
| 		client := providers.Google.GetClient() |  | ||||||
|  |  | ||||||
| 		log.Debug().Msg("Got client from google") |  | ||||||
|  |  | ||||||
| 		// Get the user from the google provider |  | ||||||
| 		user, err := GetGoogleUser(client) |  | ||||||
|  |  | ||||||
| 		// Check if there was an error |  | ||||||
| 		if err != nil { |  | ||||||
| 			return user, err |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		log.Debug().Msg("Got user from google") |  | ||||||
|  |  | ||||||
| 		// Return the user |  | ||||||
| 		return user, nil |  | ||||||
| 	case "generic": |  | ||||||
| 		// If the generic provider is not configured, return an error |  | ||||||
| 		if providers.Generic == nil { |  | ||||||
| 			log.Debug().Msg("Generic provider not configured") |  | ||||||
| 			return user, nil |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		// Get the client from the generic provider |  | ||||||
| 		client := providers.Generic.GetClient() |  | ||||||
|  |  | ||||||
| 		log.Debug().Msg("Got client from generic") |  | ||||||
|  |  | ||||||
| 		// Get the user from the generic provider |  | ||||||
| 		user, err := GetGenericUser(client, providers.Config.GenericUserURL) |  | ||||||
|  |  | ||||||
| 		// Check if there was an error |  | ||||||
| 		if err != nil { |  | ||||||
| 			return user, err |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		log.Debug().Msg("Got user from generic") |  | ||||||
|  |  | ||||||
| 		// Return the email |  | ||||||
| 		return user, nil |  | ||||||
| 	default: |  | ||||||
| 		return user, nil |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (provider *Providers) GetConfiguredProviders() []string { |  | ||||||
| 	// Create a list of the configured providers |  | ||||||
| 	providers := []string{} |  | ||||||
| 	if provider.Github != nil { |  | ||||||
| 		providers = append(providers, "github") |  | ||||||
| 	} |  | ||||||
| 	if provider.Google != nil { |  | ||||||
| 		providers = append(providers, "google") |  | ||||||
| 	} |  | ||||||
| 	if provider.Generic != nil { |  | ||||||
| 		providers = append(providers, "generic") |  | ||||||
| 	} |  | ||||||
| 	return providers |  | ||||||
| } |  | ||||||
| @@ -1,127 +0,0 @@ | |||||||
| package server |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"fmt" |  | ||||||
| 	"io/fs" |  | ||||||
| 	"net/http" |  | ||||||
| 	"os" |  | ||||||
| 	"strings" |  | ||||||
| 	"time" |  | ||||||
| 	"tinyauth/internal/assets" |  | ||||||
| 	"tinyauth/internal/handlers" |  | ||||||
| 	"tinyauth/internal/types" |  | ||||||
|  |  | ||||||
| 	"github.com/gin-gonic/gin" |  | ||||||
| 	"github.com/rs/zerolog/log" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| type Server struct { |  | ||||||
| 	Config   types.ServerConfig |  | ||||||
| 	Handlers *handlers.Handlers |  | ||||||
| 	Router   *gin.Engine |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func NewServer(config types.ServerConfig, handlers *handlers.Handlers) (*Server, error) { |  | ||||||
| 	// Disable gin logs |  | ||||||
| 	gin.SetMode(gin.ReleaseMode) |  | ||||||
|  |  | ||||||
| 	// Create router and use zerolog for logs |  | ||||||
| 	log.Debug().Msg("Setting up router") |  | ||||||
| 	router := gin.New() |  | ||||||
| 	router.Use(zerolog()) |  | ||||||
|  |  | ||||||
| 	// Read UI assets |  | ||||||
| 	log.Debug().Msg("Setting up assets") |  | ||||||
| 	dist, err := fs.Sub(assets.Assets, "dist") |  | ||||||
|  |  | ||||||
| 	if err != nil { |  | ||||||
| 		return nil, err |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Create file server |  | ||||||
| 	log.Debug().Msg("Setting up file server") |  | ||||||
| 	fileServer := http.FileServer(http.FS(dist)) |  | ||||||
|  |  | ||||||
| 	// UI middleware |  | ||||||
| 	router.Use(func(c *gin.Context) { |  | ||||||
| 		// If not an API request, serve the UI |  | ||||||
| 		if !strings.HasPrefix(c.Request.URL.Path, "/api") { |  | ||||||
| 			// Check if the file exists |  | ||||||
| 			_, err := fs.Stat(dist, strings.TrimPrefix(c.Request.URL.Path, "/")) |  | ||||||
|  |  | ||||||
| 			// If the file doesn't exist, serve the index.html |  | ||||||
| 			if os.IsNotExist(err) { |  | ||||||
| 				c.Request.URL.Path = "/" |  | ||||||
| 			} |  | ||||||
|  |  | ||||||
| 			// Serve the file |  | ||||||
| 			fileServer.ServeHTTP(c.Writer, c.Request) |  | ||||||
|  |  | ||||||
| 			// Stop further processing |  | ||||||
| 			c.Abort() |  | ||||||
| 		} |  | ||||||
| 	}) |  | ||||||
|  |  | ||||||
| 	// Proxy routes |  | ||||||
| 	router.GET("/api/auth/:proxy", handlers.AuthHandler) |  | ||||||
|  |  | ||||||
| 	// Auth routes |  | ||||||
| 	router.POST("/api/login", handlers.LoginHandler) |  | ||||||
| 	router.POST("/api/totp", handlers.TotpHandler) |  | ||||||
| 	router.POST("/api/logout", handlers.LogoutHandler) |  | ||||||
|  |  | ||||||
| 	// Context routes |  | ||||||
| 	router.GET("/api/app", handlers.AppHandler) |  | ||||||
| 	router.GET("/api/user", handlers.UserHandler) |  | ||||||
|  |  | ||||||
| 	// OAuth routes |  | ||||||
| 	router.GET("/api/oauth/url/:provider", handlers.OauthUrlHandler) |  | ||||||
| 	router.GET("/api/oauth/callback/:provider", handlers.OauthCallbackHandler) |  | ||||||
|  |  | ||||||
| 	// App routes |  | ||||||
| 	router.GET("/api/healthcheck", handlers.HealthcheckHandler) |  | ||||||
|  |  | ||||||
| 	// Return the server |  | ||||||
| 	return &Server{ |  | ||||||
| 		Config:   config, |  | ||||||
| 		Handlers: handlers, |  | ||||||
| 		Router:   router, |  | ||||||
| 	}, nil |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func (s *Server) Start() error { |  | ||||||
| 	// Run server |  | ||||||
| 	log.Info().Str("address", s.Config.Address).Int("port", s.Config.Port).Msg("Starting server") |  | ||||||
|  |  | ||||||
| 	return s.Router.Run(fmt.Sprintf("%s:%d", s.Config.Address, s.Config.Port)) |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // zerolog is a middleware for gin that logs requests using zerolog |  | ||||||
| func zerolog() gin.HandlerFunc { |  | ||||||
| 	return func(c *gin.Context) { |  | ||||||
| 		// Get initial time |  | ||||||
| 		tStart := time.Now() |  | ||||||
|  |  | ||||||
| 		// Process request |  | ||||||
| 		c.Next() |  | ||||||
|  |  | ||||||
| 		// Get status code, address, method and path |  | ||||||
| 		code := c.Writer.Status() |  | ||||||
| 		address := c.Request.RemoteAddr |  | ||||||
| 		method := c.Request.Method |  | ||||||
| 		path := c.Request.URL.Path |  | ||||||
|  |  | ||||||
| 		// Get latency |  | ||||||
| 		latency := time.Since(tStart).String() |  | ||||||
|  |  | ||||||
| 		// Log request |  | ||||||
| 		switch { |  | ||||||
| 		case code >= 200 && code < 300: |  | ||||||
| 			log.Info().Str("method", method).Str("path", path).Str("address", address).Int("status", code).Str("latency", latency).Msg("Request") |  | ||||||
| 		case code >= 300 && code < 400: |  | ||||||
| 			log.Warn().Str("method", method).Str("path", path).Str("address", address).Int("status", code).Str("latency", latency).Msg("Request") |  | ||||||
| 		case code >= 400: |  | ||||||
| 			log.Error().Str("method", method).Str("path", path).Str("address", address).Int("status", code).Str("latency", latency).Msg("Request") |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
| @@ -1,315 +0,0 @@ | |||||||
| package server_test |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"encoding/json" |  | ||||||
| 	"io" |  | ||||||
| 	"net/http" |  | ||||||
| 	"net/http/httptest" |  | ||||||
| 	"reflect" |  | ||||||
| 	"strings" |  | ||||||
| 	"testing" |  | ||||||
| 	"tinyauth/internal/auth" |  | ||||||
| 	"tinyauth/internal/docker" |  | ||||||
| 	"tinyauth/internal/handlers" |  | ||||||
| 	"tinyauth/internal/hooks" |  | ||||||
| 	"tinyauth/internal/providers" |  | ||||||
| 	"tinyauth/internal/server" |  | ||||||
| 	"tinyauth/internal/types" |  | ||||||
|  |  | ||||||
| 	"github.com/magiconair/properties/assert" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| // Simple server config for tests |  | ||||||
| var serverConfig = types.ServerConfig{ |  | ||||||
| 	Port:    8080, |  | ||||||
| 	Address: "0.0.0.0", |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Simple handlers config for tests |  | ||||||
| var handlersConfig = types.HandlersConfig{ |  | ||||||
| 	AppURL:                "http://localhost:8080", |  | ||||||
| 	Domain:                "localhost", |  | ||||||
| 	DisableContinue:       false, |  | ||||||
| 	CookieSecure:          false, |  | ||||||
| 	Title:                 "Tinyauth", |  | ||||||
| 	GenericName:           "Generic", |  | ||||||
| 	ForgotPasswordMessage: "Some message", |  | ||||||
| 	CsrfCookieName:        "tinyauth-csrf", |  | ||||||
| 	RedirectCookieName:    "tinyauth-redirect", |  | ||||||
| 	BackgroundImage:       "https://example.com/image.png", |  | ||||||
| 	OAuthAutoRedirect:     "none", |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Simple auth config for tests |  | ||||||
| var authConfig = types.AuthConfig{ |  | ||||||
| 	Users:             types.Users{}, |  | ||||||
| 	OauthWhitelist:    "", |  | ||||||
| 	HMACSecret:        "super-secret-api-thing-for-test1", |  | ||||||
| 	EncryptionSecret:  "super-secret-api-thing-for-test2", |  | ||||||
| 	CookieSecure:      false, |  | ||||||
| 	SessionExpiry:     3600, |  | ||||||
| 	LoginTimeout:      0, |  | ||||||
| 	LoginMaxRetries:   0, |  | ||||||
| 	SessionCookieName: "tinyauth-session", |  | ||||||
| 	Domain:            "localhost", |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Simple hooks config for tests |  | ||||||
| var hooksConfig = types.HooksConfig{ |  | ||||||
| 	Domain: "localhost", |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Cookie |  | ||||||
| var cookie string |  | ||||||
|  |  | ||||||
| // User |  | ||||||
| var user = types.User{ |  | ||||||
| 	Username: "user", |  | ||||||
| 	Password: "$2a$10$AvGHLTYv3xiRJ0xV9xs3XeVIlkGTygI9nqIamFYB5Xu.5.0UWF7B6", // pass |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // We need all this to be able to test the server |  | ||||||
| func getServer(t *testing.T) *server.Server { |  | ||||||
| 	// Create docker service |  | ||||||
| 	docker, err := docker.NewDocker() |  | ||||||
|  |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Failed to initialize docker: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Create auth service |  | ||||||
| 	authConfig.Users = types.Users{ |  | ||||||
| 		{ |  | ||||||
| 			Username: user.Username, |  | ||||||
| 			Password: user.Password, |  | ||||||
| 		}, |  | ||||||
| 	} |  | ||||||
| 	auth := auth.NewAuth(authConfig, docker) |  | ||||||
|  |  | ||||||
| 	// Create providers service |  | ||||||
| 	providers := providers.NewProviders(types.OAuthConfig{}) |  | ||||||
|  |  | ||||||
| 	// Create hooks service |  | ||||||
| 	hooks := hooks.NewHooks(hooksConfig, auth, providers) |  | ||||||
|  |  | ||||||
| 	// Create handlers service |  | ||||||
| 	handlers := handlers.NewHandlers(handlersConfig, auth, hooks, providers, docker) |  | ||||||
|  |  | ||||||
| 	// Create server |  | ||||||
| 	srv, err := server.NewServer(serverConfig, handlers) |  | ||||||
|  |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Failed to create server: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Return the server |  | ||||||
| 	return srv |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Test login |  | ||||||
| func TestLogin(t *testing.T) { |  | ||||||
| 	t.Log("Testing login") |  | ||||||
|  |  | ||||||
| 	// Get server |  | ||||||
| 	api := getServer(t) |  | ||||||
|  |  | ||||||
| 	// Create recorder |  | ||||||
| 	recorder := httptest.NewRecorder() |  | ||||||
|  |  | ||||||
| 	// Create request |  | ||||||
| 	user := types.LoginRequest{ |  | ||||||
| 		Username: "user", |  | ||||||
| 		Password: "pass", |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	json, err := json.Marshal(user) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Error marshalling json: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Create request |  | ||||||
| 	req, err := http.NewRequest("POST", "/api/login", strings.NewReader(string(json))) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Error creating request: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Serve the request |  | ||||||
| 	api.Router.ServeHTTP(recorder, req) |  | ||||||
|  |  | ||||||
| 	// Assert |  | ||||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) |  | ||||||
|  |  | ||||||
| 	// Get the cookie |  | ||||||
| 	cookie = recorder.Result().Cookies()[0].Value |  | ||||||
|  |  | ||||||
| 	// Check if the cookie is set |  | ||||||
| 	if cookie == "" { |  | ||||||
| 		t.Fatalf("Cookie not set") |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Test app context |  | ||||||
| func TestAppContext(t *testing.T) { |  | ||||||
| 	t.Log("Testing app context") |  | ||||||
|  |  | ||||||
| 	// Get server |  | ||||||
| 	api := getServer(t) |  | ||||||
|  |  | ||||||
| 	// Create recorder |  | ||||||
| 	recorder := httptest.NewRecorder() |  | ||||||
|  |  | ||||||
| 	// Create request |  | ||||||
| 	req, err := http.NewRequest("GET", "/api/app", nil) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Error creating request: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Set the cookie |  | ||||||
| 	req.AddCookie(&http.Cookie{ |  | ||||||
| 		Name:  "tinyauth", |  | ||||||
| 		Value: cookie, |  | ||||||
| 	}) |  | ||||||
|  |  | ||||||
| 	// Serve the request |  | ||||||
| 	api.Router.ServeHTTP(recorder, req) |  | ||||||
|  |  | ||||||
| 	// Assert |  | ||||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) |  | ||||||
|  |  | ||||||
| 	// Read the body of the response |  | ||||||
| 	body, err := io.ReadAll(recorder.Body) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Error getting body: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Unmarshal the body into the user struct |  | ||||||
| 	var app types.AppContext |  | ||||||
|  |  | ||||||
| 	err = json.Unmarshal(body, &app) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Error unmarshalling body: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Create tests values |  | ||||||
| 	expected := types.AppContext{ |  | ||||||
| 		Status:                200, |  | ||||||
| 		Message:               "OK", |  | ||||||
| 		ConfiguredProviders:   []string{"username"}, |  | ||||||
| 		DisableContinue:       false, |  | ||||||
| 		Title:                 "Tinyauth", |  | ||||||
| 		GenericName:           "Generic", |  | ||||||
| 		ForgotPasswordMessage: "Some message", |  | ||||||
| 		BackgroundImage:       "https://example.com/image.png", |  | ||||||
| 		OAuthAutoRedirect:     "none", |  | ||||||
| 		Domain:                "localhost", |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// We should get the username back |  | ||||||
| 	if !reflect.DeepEqual(app, expected) { |  | ||||||
| 		t.Fatalf("Expected %v, got %v", expected, app) |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Test user context |  | ||||||
| func TestUserContext(t *testing.T) { |  | ||||||
| 	t.Log("Testing user context") |  | ||||||
|  |  | ||||||
| 	// Get server |  | ||||||
| 	api := getServer(t) |  | ||||||
|  |  | ||||||
| 	// Create recorder |  | ||||||
| 	recorder := httptest.NewRecorder() |  | ||||||
|  |  | ||||||
| 	// Create request |  | ||||||
| 	req, err := http.NewRequest("GET", "/api/user", nil) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Error creating request: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Set the cookie |  | ||||||
| 	req.AddCookie(&http.Cookie{ |  | ||||||
| 		Name:  "tinyauth-session", |  | ||||||
| 		Value: cookie, |  | ||||||
| 	}) |  | ||||||
|  |  | ||||||
| 	// Serve the request |  | ||||||
| 	api.Router.ServeHTTP(recorder, req) |  | ||||||
|  |  | ||||||
| 	// Assert |  | ||||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) |  | ||||||
|  |  | ||||||
| 	// Read the body of the response |  | ||||||
| 	body, err := io.ReadAll(recorder.Body) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Error getting body: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Unmarshal the body into the user struct |  | ||||||
| 	type User struct { |  | ||||||
| 		Username string `json:"username"` |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	var user User |  | ||||||
|  |  | ||||||
| 	err = json.Unmarshal(body, &user) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Error unmarshalling body: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// We should get the username back |  | ||||||
| 	if user.Username != "user" { |  | ||||||
| 		t.Fatalf("Expected user, got %s", user.Username) |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Test logout |  | ||||||
| func TestLogout(t *testing.T) { |  | ||||||
| 	t.Log("Testing logout") |  | ||||||
|  |  | ||||||
| 	// Get server |  | ||||||
| 	api := getServer(t) |  | ||||||
|  |  | ||||||
| 	// Create recorder |  | ||||||
| 	recorder := httptest.NewRecorder() |  | ||||||
|  |  | ||||||
| 	// Create request |  | ||||||
| 	req, err := http.NewRequest("POST", "/api/logout", nil) |  | ||||||
|  |  | ||||||
| 	// Check if there was an error |  | ||||||
| 	if err != nil { |  | ||||||
| 		t.Fatalf("Error creating request: %v", err) |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Set the cookie |  | ||||||
| 	req.AddCookie(&http.Cookie{ |  | ||||||
| 		Name:  "tinyauth", |  | ||||||
| 		Value: cookie, |  | ||||||
| 	}) |  | ||||||
|  |  | ||||||
| 	// Serve the request |  | ||||||
| 	api.Router.ServeHTTP(recorder, req) |  | ||||||
|  |  | ||||||
| 	// Assert |  | ||||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) |  | ||||||
|  |  | ||||||
| 	// Check if the cookie is different (means go sessions flushed it) |  | ||||||
| 	if recorder.Result().Cookies()[0].Value == cookie { |  | ||||||
| 		t.Fatalf("Cookie not flushed") |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package auth | package service | ||||||
| 
 | 
 | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| @@ -6,8 +6,7 @@ import ( | |||||||
| 	"strings" | 	"strings" | ||||||
| 	"sync" | 	"sync" | ||||||
| 	"time" | 	"time" | ||||||
| 	"tinyauth/internal/docker" | 	"tinyauth/internal/config" | ||||||
| 	"tinyauth/internal/types" |  | ||||||
| 	"tinyauth/internal/utils" | 	"tinyauth/internal/utils" | ||||||
| 
 | 
 | ||||||
| 	"github.com/gin-gonic/gin" | 	"github.com/gin-gonic/gin" | ||||||
| @@ -16,51 +15,66 @@ import ( | |||||||
| 	"golang.org/x/crypto/bcrypt" | 	"golang.org/x/crypto/bcrypt" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| type Auth struct { | type LoginAttempt struct { | ||||||
| 	Config        types.AuthConfig | 	FailedAttempts int | ||||||
| 	Docker        *docker.Docker | 	LastAttempt    time.Time | ||||||
| 	LoginAttempts map[string]*types.LoginAttempt | 	LockedUntil    time.Time | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | type AuthServiceConfig struct { | ||||||
|  | 	Users             []config.User | ||||||
|  | 	OauthWhitelist    string | ||||||
|  | 	SessionExpiry     int | ||||||
|  | 	SecureCookie      bool | ||||||
|  | 	Domain            string | ||||||
|  | 	LoginTimeout      int | ||||||
|  | 	LoginMaxRetries   int | ||||||
|  | 	SessionCookieName string | ||||||
|  | 	HMACSecret        string | ||||||
|  | 	EncryptionSecret  string | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | type AuthService struct { | ||||||
|  | 	Config        AuthServiceConfig | ||||||
|  | 	Docker        *DockerService | ||||||
|  | 	LoginAttempts map[string]*LoginAttempt | ||||||
| 	LoginMutex    sync.RWMutex | 	LoginMutex    sync.RWMutex | ||||||
| 	Store         *sessions.CookieStore | 	Store         *sessions.CookieStore | ||||||
|  | 	LDAP          *LdapService | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func NewAuth(config types.AuthConfig, docker *docker.Docker) *Auth { | func NewAuthService(config AuthServiceConfig, docker *DockerService, ldap *LdapService) *AuthService { | ||||||
| 	// Create cookie store | 	return &AuthService{ | ||||||
| 	store := sessions.NewCookieStore([]byte(config.HMACSecret), []byte(config.EncryptionSecret)) |  | ||||||
| 
 |  | ||||||
| 	// Configure cookie store |  | ||||||
| 	store.Options = &sessions.Options{ |  | ||||||
| 		Path:     "/", |  | ||||||
| 		MaxAge:   config.SessionExpiry, |  | ||||||
| 		Secure:   config.CookieSecure, |  | ||||||
| 		HttpOnly: true, |  | ||||||
| 		Domain:   fmt.Sprintf(".%s", config.Domain), |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	return &Auth{ |  | ||||||
| 		Config:        config, | 		Config:        config, | ||||||
| 		Docker:        docker, | 		Docker:        docker, | ||||||
| 		LoginAttempts: make(map[string]*types.LoginAttempt), | 		LoginAttempts: make(map[string]*LoginAttempt), | ||||||
| 		Store:         store, | 		LDAP:          ldap, | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) GetSession(c *gin.Context) (*sessions.Session, error) { | func (auth *AuthService) Init() error { | ||||||
| 	// Get session | 	store := sessions.NewCookieStore([]byte(auth.Config.HMACSecret), []byte(auth.Config.EncryptionSecret)) | ||||||
|  | 	store.Options = &sessions.Options{ | ||||||
|  | 		Path:     "/", | ||||||
|  | 		MaxAge:   auth.Config.SessionExpiry, | ||||||
|  | 		Secure:   auth.Config.SecureCookie, | ||||||
|  | 		HttpOnly: true, | ||||||
|  | 		Domain:   fmt.Sprintf(".%s", auth.Config.Domain), | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	auth.Store = store | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | func (auth *AuthService) GetSession(c *gin.Context) (*sessions.Session, error) { | ||||||
| 	session, err := auth.Store.Get(c.Request, auth.Config.SessionCookieName) | 	session, err := auth.Store.Get(c.Request, auth.Config.SessionCookieName) | ||||||
| 
 | 
 | ||||||
|  | 	// If there was an error getting the session, it might be invalid so let's clear it and retry | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Warn().Err(err).Msg("Invalid session, clearing cookie and retrying") | 		log.Debug().Err(err).Msg("Error getting session, creating a new one") | ||||||
| 
 | 		c.SetCookie(auth.Config.SessionCookieName, "", -1, "/", fmt.Sprintf(".%s", auth.Config.Domain), auth.Config.SecureCookie, true) | ||||||
| 		// Delete the session cookie if there is an error | 		session, err = auth.Store.New(c.Request, auth.Config.SessionCookieName) | ||||||
| 		c.SetCookie(auth.Config.SessionCookieName, "", -1, "/", fmt.Sprintf(".%s", auth.Config.Domain), auth.Config.CookieSecure, true) |  | ||||||
| 
 |  | ||||||
| 		// Try to get the session again |  | ||||||
| 		session, err = auth.Store.Get(c.Request, auth.Config.SessionCookieName) |  | ||||||
| 
 |  | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			// If we still can't get the session, log the error and return nil |  | ||||||
| 			log.Error().Err(err).Msg("Failed to get session") |  | ||||||
| 			return nil, err | 			return nil, err | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| @@ -68,23 +82,79 @@ func (auth *Auth) GetSession(c *gin.Context) (*sessions.Session, error) { | |||||||
| 	return session, nil | 	return session, nil | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) GetUser(username string) *types.User { | func (auth *AuthService) SearchUser(username string) config.UserSearch { | ||||||
| 	// Loop through users and return the user if the username matches | 	if auth.GetLocalUser(username).Username != "" { | ||||||
| 	for _, user := range auth.Config.Users { | 		return config.UserSearch{ | ||||||
| 		if user.Username == username { | 			Username: username, | ||||||
| 			return &user | 			Type:     "local", | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| 	return nil | 
 | ||||||
|  | 	if auth.LDAP != nil { | ||||||
|  | 		userDN, err := auth.LDAP.Search(username) | ||||||
|  | 
 | ||||||
|  | 		if err != nil { | ||||||
|  | 			log.Warn().Err(err).Str("username", username).Msg("Failed to search for user in LDAP") | ||||||
|  | 			return config.UserSearch{} | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
|  | 		return config.UserSearch{ | ||||||
|  | 			Username: userDN, | ||||||
|  | 			Type:     "ldap", | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	return config.UserSearch{ | ||||||
|  | 		Type: "unknown", | ||||||
|  | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) CheckPassword(user types.User, password string) bool { | func (auth *AuthService) VerifyUser(search config.UserSearch, password string) bool { | ||||||
| 	// Compare the hashed password with the password provided | 	switch search.Type { | ||||||
|  | 	case "local": | ||||||
|  | 		user := auth.GetLocalUser(search.Username) | ||||||
|  | 		return auth.CheckPassword(user, password) | ||||||
|  | 	case "ldap": | ||||||
|  | 		if auth.LDAP != nil { | ||||||
|  | 			err := auth.LDAP.Bind(search.Username, password) | ||||||
|  | 			if err != nil { | ||||||
|  | 				log.Warn().Err(err).Str("username", search.Username).Msg("Failed to bind to LDAP") | ||||||
|  | 				return false | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
|  | 			err = auth.LDAP.Bind(auth.LDAP.Config.BindDN, auth.LDAP.Config.BindPassword) | ||||||
|  | 			if err != nil { | ||||||
|  | 				log.Error().Err(err).Msg("Failed to rebind with service account after user authentication") | ||||||
|  | 				return false | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
|  | 			return true | ||||||
|  | 		} | ||||||
|  | 	default: | ||||||
|  | 		log.Debug().Str("type", search.Type).Msg("Unknown user type for authentication") | ||||||
|  | 		return false | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	log.Warn().Str("username", search.Username).Msg("User authentication failed") | ||||||
|  | 	return false | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | func (auth *AuthService) GetLocalUser(username string) config.User { | ||||||
|  | 	for _, user := range auth.Config.Users { | ||||||
|  | 		if user.Username == username { | ||||||
|  | 			return user | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	log.Warn().Str("username", username).Msg("Local user not found") | ||||||
|  | 	return config.User{} | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | func (auth *AuthService) CheckPassword(user config.User, password string) bool { | ||||||
| 	return bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password)) == nil | 	return bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password)) == nil | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // IsAccountLocked checks if a username or IP is locked due to too many failed login attempts | func (auth *AuthService) IsAccountLocked(identifier string) (bool, int) { | ||||||
| func (auth *Auth) IsAccountLocked(identifier string) (bool, int) { |  | ||||||
| 	auth.LoginMutex.RLock() | 	auth.LoginMutex.RLock() | ||||||
| 	defer auth.LoginMutex.RUnlock() | 	defer auth.LoginMutex.RUnlock() | ||||||
| 
 | 
 | ||||||
| @@ -110,8 +180,7 @@ func (auth *Auth) IsAccountLocked(identifier string) (bool, int) { | |||||||
| 	return false, 0 | 	return false, 0 | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // RecordLoginAttempt records a login attempt for rate limiting | func (auth *AuthService) RecordLoginAttempt(identifier string, success bool) { | ||||||
| func (auth *Auth) RecordLoginAttempt(identifier string, success bool) { |  | ||||||
| 	// Skip if rate limiting is not configured | 	// Skip if rate limiting is not configured | ||||||
| 	if auth.Config.LoginMaxRetries <= 0 || auth.Config.LoginTimeout <= 0 { | 	if auth.Config.LoginMaxRetries <= 0 || auth.Config.LoginTimeout <= 0 { | ||||||
| 		return | 		return | ||||||
| @@ -123,7 +192,7 @@ func (auth *Auth) RecordLoginAttempt(identifier string, success bool) { | |||||||
| 	// Get current attempt record or create a new one | 	// Get current attempt record or create a new one | ||||||
| 	attempt, exists := auth.LoginAttempts[identifier] | 	attempt, exists := auth.LoginAttempts[identifier] | ||||||
| 	if !exists { | 	if !exists { | ||||||
| 		attempt = &types.LoginAttempt{} | 		attempt = &LoginAttempt{} | ||||||
| 		auth.LoginAttempts[identifier] = attempt | 		auth.LoginAttempts[identifier] = attempt | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| @@ -147,23 +216,16 @@ func (auth *Auth) RecordLoginAttempt(identifier string, success bool) { | |||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) EmailWhitelisted(emailSrc string) bool { | func (auth *AuthService) EmailWhitelisted(email string) bool { | ||||||
| 	return utils.CheckWhitelist(auth.Config.OauthWhitelist, emailSrc) | 	return utils.CheckFilter(auth.Config.OauthWhitelist, email) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) CreateSessionCookie(c *gin.Context, data *types.SessionCookie) error { | func (auth *AuthService) CreateSessionCookie(c *gin.Context, data *config.SessionCookie) error { | ||||||
| 	log.Debug().Msg("Creating session cookie") |  | ||||||
| 
 |  | ||||||
| 	// Get session |  | ||||||
| 	session, err := auth.GetSession(c) | 	session, err := auth.GetSession(c) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Error().Err(err).Msg("Failed to get session") |  | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	log.Debug().Msg("Setting session cookie") |  | ||||||
| 
 |  | ||||||
| 	// Calculate expiry |  | ||||||
| 	var sessionExpiry int | 	var sessionExpiry int | ||||||
| 
 | 
 | ||||||
| 	if data.TotpPending { | 	if data.TotpPending { | ||||||
| @@ -172,7 +234,6 @@ func (auth *Auth) CreateSessionCookie(c *gin.Context, data *types.SessionCookie) | |||||||
| 		sessionExpiry = auth.Config.SessionExpiry | 		sessionExpiry = auth.Config.SessionExpiry | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// Set data |  | ||||||
| 	session.Values["username"] = data.Username | 	session.Values["username"] = data.Username | ||||||
| 	session.Values["name"] = data.Name | 	session.Values["name"] = data.Name | ||||||
| 	session.Values["email"] = data.Email | 	session.Values["email"] = data.Email | ||||||
| @@ -181,24 +242,17 @@ func (auth *Auth) CreateSessionCookie(c *gin.Context, data *types.SessionCookie) | |||||||
| 	session.Values["totpPending"] = data.TotpPending | 	session.Values["totpPending"] = data.TotpPending | ||||||
| 	session.Values["oauthGroups"] = data.OAuthGroups | 	session.Values["oauthGroups"] = data.OAuthGroups | ||||||
| 
 | 
 | ||||||
| 	// Save session |  | ||||||
| 	err = session.Save(c.Request, c.Writer) | 	err = session.Save(c.Request, c.Writer) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Error().Err(err).Msg("Failed to save session") |  | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// Return nil |  | ||||||
| 	return nil | 	return nil | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) DeleteSessionCookie(c *gin.Context) error { | func (auth *AuthService) DeleteSessionCookie(c *gin.Context) error { | ||||||
| 	log.Debug().Msg("Deleting session cookie") |  | ||||||
| 
 |  | ||||||
| 	// Get session |  | ||||||
| 	session, err := auth.GetSession(c) | 	session, err := auth.GetSession(c) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Error().Err(err).Msg("Failed to get session") |  | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| @@ -207,30 +261,23 @@ func (auth *Auth) DeleteSessionCookie(c *gin.Context) error { | |||||||
| 		delete(session.Values, key) | 		delete(session.Values, key) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// Save session |  | ||||||
| 	err = session.Save(c.Request, c.Writer) | 	err = session.Save(c.Request, c.Writer) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Error().Err(err).Msg("Failed to save session") |  | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// Return nil | 	// Clear the cookie in the browser | ||||||
|  | 	c.SetCookie(auth.Config.SessionCookieName, "", -1, "/", fmt.Sprintf(".%s", auth.Config.Domain), auth.Config.SecureCookie, true) | ||||||
|  | 
 | ||||||
| 	return nil | 	return nil | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) GetSessionCookie(c *gin.Context) (types.SessionCookie, error) { | func (auth *AuthService) GetSessionCookie(c *gin.Context) (config.SessionCookie, error) { | ||||||
| 	log.Debug().Msg("Getting session cookie") |  | ||||||
| 
 |  | ||||||
| 	// Get session |  | ||||||
| 	session, err := auth.GetSession(c) | 	session, err := auth.GetSession(c) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Error().Err(err).Msg("Failed to get session") | 		return config.SessionCookie{}, err | ||||||
| 		return types.SessionCookie{}, err |  | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	log.Debug().Msg("Got session") |  | ||||||
| 
 |  | ||||||
| 	// Get data from session |  | ||||||
| 	username, usernameOk := session.Values["username"].(string) | 	username, usernameOk := session.Values["username"].(string) | ||||||
| 	email, emailOk := session.Values["email"].(string) | 	email, emailOk := session.Values["email"].(string) | ||||||
| 	name, nameOk := session.Values["name"].(string) | 	name, nameOk := session.Values["name"].(string) | ||||||
| @@ -239,31 +286,21 @@ func (auth *Auth) GetSessionCookie(c *gin.Context) (types.SessionCookie, error) | |||||||
| 	totpPending, totpPendingOk := session.Values["totpPending"].(bool) | 	totpPending, totpPendingOk := session.Values["totpPending"].(bool) | ||||||
| 	oauthGroups, oauthGroupsOk := session.Values["oauthGroups"].(string) | 	oauthGroups, oauthGroupsOk := session.Values["oauthGroups"].(string) | ||||||
| 
 | 
 | ||||||
|  | 	// If any data is missing, delete the session cookie | ||||||
| 	if !usernameOk || !providerOK || !expiryOk || !totpPendingOk || !emailOk || !nameOk || !oauthGroupsOk { | 	if !usernameOk || !providerOK || !expiryOk || !totpPendingOk || !emailOk || !nameOk || !oauthGroupsOk { | ||||||
| 		log.Warn().Msg("Session cookie is invalid") | 		log.Warn().Msg("Session cookie is invalid") | ||||||
| 
 |  | ||||||
| 		// If any data is missing, delete the session cookie |  | ||||||
| 		auth.DeleteSessionCookie(c) | 		auth.DeleteSessionCookie(c) | ||||||
| 
 | 		return config.SessionCookie{}, nil | ||||||
| 		// Return empty cookie |  | ||||||
| 		return types.SessionCookie{}, nil |  | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// Check if the cookie has expired | 	// If the session cookie has expired, delete it | ||||||
| 	if time.Now().Unix() > expiry { | 	if time.Now().Unix() > expiry { | ||||||
| 		log.Warn().Msg("Session cookie expired") | 		log.Warn().Msg("Session cookie expired") | ||||||
| 
 |  | ||||||
| 		// If it has, delete it |  | ||||||
| 		auth.DeleteSessionCookie(c) | 		auth.DeleteSessionCookie(c) | ||||||
| 
 | 		return config.SessionCookie{}, nil | ||||||
| 		// Return empty cookie |  | ||||||
| 		return types.SessionCookie{}, nil |  | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	log.Debug().Str("username", username).Str("provider", provider).Int64("expiry", expiry).Bool("totpPending", totpPending).Str("name", name).Str("email", email).Str("oauthGroups", oauthGroups).Msg("Parsed cookie") | 	return config.SessionCookie{ | ||||||
| 
 |  | ||||||
| 	// Return the cookie |  | ||||||
| 	return types.SessionCookie{ |  | ||||||
| 		Username:    username, | 		Username:    username, | ||||||
| 		Name:        name, | 		Name:        name, | ||||||
| 		Email:       email, | 		Email:       email, | ||||||
| @@ -273,31 +310,26 @@ func (auth *Auth) GetSessionCookie(c *gin.Context) (types.SessionCookie, error) | |||||||
| 	}, nil | 	}, nil | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) UserAuthConfigured() bool { | func (auth *AuthService) UserAuthConfigured() bool { | ||||||
| 	// If there are users, return true | 	// If there are users or LDAP is configured, return true | ||||||
| 	return len(auth.Config.Users) > 0 | 	return len(auth.Config.Users) > 0 || auth.LDAP != nil | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) ResourceAllowed(c *gin.Context, context types.UserContext, labels types.Labels) bool { | func (auth *AuthService) ResourceAllowed(c *gin.Context, context config.UserContext, labels config.Labels) bool { | ||||||
| 	// Check if oauth is allowed |  | ||||||
| 	if context.OAuth { | 	if context.OAuth { | ||||||
| 		log.Debug().Msg("Checking OAuth whitelist") | 		log.Debug().Msg("Checking OAuth whitelist") | ||||||
| 		return utils.CheckWhitelist(labels.OAuth.Whitelist, context.Email) | 		return utils.CheckFilter(labels.OAuth.Whitelist, context.Email) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// Check users |  | ||||||
| 	log.Debug().Msg("Checking users") | 	log.Debug().Msg("Checking users") | ||||||
| 
 | 	return utils.CheckFilter(labels.Users, context.Username) | ||||||
| 	return utils.CheckWhitelist(labels.Users, context.Username) |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) OAuthGroup(c *gin.Context, context types.UserContext, labels types.Labels) bool { | func (auth *AuthService) OAuthGroup(c *gin.Context, context config.UserContext, labels config.Labels) bool { | ||||||
| 	// Check if groups are required |  | ||||||
| 	if labels.OAuth.Groups == "" { | 	if labels.OAuth.Groups == "" { | ||||||
| 		return true | 		return true | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// Check if we are using the generic oauth provider |  | ||||||
| 	if context.Provider != "generic" { | 	if context.Provider != "generic" { | ||||||
| 		log.Debug().Msg("Not using generic provider, skipping group check") | 		log.Debug().Msg("Not using generic provider, skipping group check") | ||||||
| 		return true | 		return true | ||||||
| @@ -308,41 +340,30 @@ func (auth *Auth) OAuthGroup(c *gin.Context, context types.UserContext, labels t | |||||||
| 
 | 
 | ||||||
| 	// For every group check if it is in the required groups | 	// For every group check if it is in the required groups | ||||||
| 	for _, group := range oauthGroups { | 	for _, group := range oauthGroups { | ||||||
| 		if utils.CheckWhitelist(labels.OAuth.Groups, group) { | 		if utils.CheckFilter(labels.OAuth.Groups, group) { | ||||||
| 			log.Debug().Str("group", group).Msg("Group is in required groups") |  | ||||||
| 			return true | 			return true | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// No groups matched | 	// No groups matched | ||||||
| 	log.Debug().Msg("No groups matched") | 	log.Debug().Msg("No groups matched") | ||||||
| 
 |  | ||||||
| 	// Return false |  | ||||||
| 	return false | 	return false | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) AuthEnabled(c *gin.Context, labels types.Labels) (bool, error) { | func (auth *AuthService) AuthEnabled(uri string, labels config.Labels) (bool, error) { | ||||||
| 	// Get headers | 	// If the label is empty, auth is enabled | ||||||
| 	uri := c.Request.Header.Get("X-Forwarded-Uri") |  | ||||||
| 
 |  | ||||||
| 	// Check if the allowed label is empty |  | ||||||
| 	if labels.Allowed == "" { | 	if labels.Allowed == "" { | ||||||
| 		// Auth enabled |  | ||||||
| 		return true, nil | 		return true, nil | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// Compile regex |  | ||||||
| 	regex, err := regexp.Compile(labels.Allowed) | 	regex, err := regexp.Compile(labels.Allowed) | ||||||
| 
 | 
 | ||||||
| 	// If there is an error, invalid regex, auth enabled |  | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Warn().Err(err).Msg("Invalid regex") |  | ||||||
| 		return true, err | 		return true, err | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	// Check if the uri matches the regex | 	// If the regex matches the URI, auth is not enabled | ||||||
| 	if regex.MatchString(uri) { | 	if regex.MatchString(uri) { | ||||||
| 		// Auth disabled |  | ||||||
| 		return false, nil | 		return false, nil | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| @@ -350,26 +371,19 @@ func (auth *Auth) AuthEnabled(c *gin.Context, labels types.Labels) (bool, error) | |||||||
| 	return true, nil | 	return true, nil | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) GetBasicAuth(c *gin.Context) *types.User { | func (auth *AuthService) GetBasicAuth(c *gin.Context) *config.User { | ||||||
| 	// Get the Authorization header |  | ||||||
| 	username, password, ok := c.Request.BasicAuth() | 	username, password, ok := c.Request.BasicAuth() | ||||||
| 
 |  | ||||||
| 	// If not ok, return an empty user |  | ||||||
| 	if !ok { | 	if !ok { | ||||||
|  | 		log.Debug().Msg("No basic auth provided") | ||||||
| 		return nil | 		return nil | ||||||
| 	} | 	} | ||||||
| 
 | 	return &config.User{ | ||||||
| 	// Return the user |  | ||||||
| 	return &types.User{ |  | ||||||
| 		Username: username, | 		Username: username, | ||||||
| 		Password: password, | 		Password: password, | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (auth *Auth) CheckIP(c *gin.Context, labels types.Labels) bool { | func (auth *AuthService) CheckIP(labels config.Labels, ip string) bool { | ||||||
| 	// Get the IP address from the request |  | ||||||
| 	ip := c.ClientIP() |  | ||||||
| 
 |  | ||||||
| 	// Check if the IP is in block list | 	// Check if the IP is in block list | ||||||
| 	for _, blocked := range labels.IP.Block { | 	for _, blocked := range labels.IP.Block { | ||||||
| 		res, err := utils.FilterIP(blocked, ip) | 		res, err := utils.FilterIP(blocked, ip) | ||||||
| @@ -378,7 +392,7 @@ func (auth *Auth) CheckIP(c *gin.Context, labels types.Labels) bool { | |||||||
| 			continue | 			continue | ||||||
| 		} | 		} | ||||||
| 		if res { | 		if res { | ||||||
| 			log.Warn().Str("ip", ip).Str("item", blocked).Msg("IP is in blocked list, denying access") | 			log.Debug().Str("ip", ip).Str("item", blocked).Msg("IP is in blocked list, denying access") | ||||||
| 			return false | 			return false | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| @@ -398,11 +412,28 @@ func (auth *Auth) CheckIP(c *gin.Context, labels types.Labels) bool { | |||||||
| 
 | 
 | ||||||
| 	// If not in allowed range and allowed range is not empty, deny access | 	// If not in allowed range and allowed range is not empty, deny access | ||||||
| 	if len(labels.IP.Allow) > 0 { | 	if len(labels.IP.Allow) > 0 { | ||||||
| 		log.Warn().Str("ip", ip).Msg("IP not in allow list, denying access") | 		log.Debug().Str("ip", ip).Msg("IP not in allow list, denying access") | ||||||
| 		return false | 		return false | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	log.Debug().Str("ip", ip).Msg("IP not in allow or block list, allowing by default") | 	log.Debug().Str("ip", ip).Msg("IP not in allow or block list, allowing by default") | ||||||
| 
 |  | ||||||
| 	return true | 	return true | ||||||
| } | } | ||||||
|  | 
 | ||||||
|  | func (auth *AuthService) BypassedIP(labels config.Labels, ip string) bool { | ||||||
|  | 	// For every IP in the bypass list, check if the IP matches | ||||||
|  | 	for _, bypassed := range labels.IP.Bypass { | ||||||
|  | 		res, err := utils.FilterIP(bypassed, ip) | ||||||
|  | 		if err != nil { | ||||||
|  | 			log.Warn().Err(err).Str("item", bypassed).Msg("Invalid IP/CIDR in bypass list") | ||||||
|  | 			continue | ||||||
|  | 		} | ||||||
|  | 		if res { | ||||||
|  | 			log.Debug().Str("ip", ip).Str("item", bypassed).Msg("IP is in bypass list, allowing access") | ||||||
|  | 			return true | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	log.Debug().Str("ip", ip).Msg("IP not in bypass list, continuing with authentication") | ||||||
|  | 	return false | ||||||
|  | } | ||||||
							
								
								
									
										100
									
								
								internal/service/docker_service.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										100
									
								
								internal/service/docker_service.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,100 @@ | |||||||
|  | package service | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"context" | ||||||
|  | 	"strings" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  | 	"tinyauth/internal/utils" | ||||||
|  |  | ||||||
|  | 	"slices" | ||||||
|  |  | ||||||
|  | 	container "github.com/docker/docker/api/types/container" | ||||||
|  | 	"github.com/docker/docker/client" | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type DockerService struct { | ||||||
|  | 	Client  *client.Client | ||||||
|  | 	Context context.Context | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewDockerService() *DockerService { | ||||||
|  | 	return &DockerService{} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (docker *DockerService) Init() error { | ||||||
|  | 	client, err := client.NewClientWithOpts(client.FromEnv) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	ctx := context.Background() | ||||||
|  | 	client.NegotiateAPIVersion(ctx) | ||||||
|  |  | ||||||
|  | 	docker.Client = client | ||||||
|  | 	docker.Context = ctx | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (docker *DockerService) GetContainers() ([]container.Summary, error) { | ||||||
|  | 	containers, err := docker.Client.ContainerList(docker.Context, container.ListOptions{}) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return nil, err | ||||||
|  | 	} | ||||||
|  | 	return containers, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (docker *DockerService) InspectContainer(containerId string) (container.InspectResponse, error) { | ||||||
|  | 	inspect, err := docker.Client.ContainerInspect(docker.Context, containerId) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return container.InspectResponse{}, err | ||||||
|  | 	} | ||||||
|  | 	return inspect, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (docker *DockerService) DockerConnected() bool { | ||||||
|  | 	_, err := docker.Client.Ping(docker.Context) | ||||||
|  | 	return err == nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (docker *DockerService) GetLabels(app string, domain string) (config.Labels, error) { | ||||||
|  | 	isConnected := docker.DockerConnected() | ||||||
|  |  | ||||||
|  | 	if !isConnected { | ||||||
|  | 		log.Debug().Msg("Docker not connected, returning empty labels") | ||||||
|  | 		return config.Labels{}, nil | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	containers, err := docker.GetContainers() | ||||||
|  | 	if err != nil { | ||||||
|  | 		return config.Labels{}, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	for _, container := range containers { | ||||||
|  | 		inspect, err := docker.InspectContainer(container.ID) | ||||||
|  | 		if err != nil { | ||||||
|  | 			log.Warn().Str("id", container.ID).Err(err).Msg("Error inspecting container, skipping") | ||||||
|  | 			continue | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		labels, err := utils.GetLabels(inspect.Config.Labels) | ||||||
|  | 		if err != nil { | ||||||
|  | 			log.Warn().Str("id", container.ID).Err(err).Msg("Error getting container labels, skipping") | ||||||
|  | 			continue | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		// Check if the container matches the ID or domain | ||||||
|  | 		if slices.Contains(labels.Domain, domain) { | ||||||
|  | 			log.Debug().Str("id", inspect.ID).Msg("Found matching container by domain") | ||||||
|  | 			return labels, nil | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if strings.TrimPrefix(inspect.Name, "/") == app { | ||||||
|  | 			log.Debug().Str("id", inspect.ID).Msg("Found matching container by name") | ||||||
|  | 			return labels, nil | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	log.Debug().Msg("No matching container found, returning empty labels") | ||||||
|  | 	return config.Labels{}, nil | ||||||
|  | } | ||||||
							
								
								
									
										117
									
								
								internal/service/generic_oauth_service.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										117
									
								
								internal/service/generic_oauth_service.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,117 @@ | |||||||
|  | package service | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"context" | ||||||
|  | 	"crypto/rand" | ||||||
|  | 	"crypto/tls" | ||||||
|  | 	"encoding/base64" | ||||||
|  | 	"encoding/json" | ||||||
|  | 	"fmt" | ||||||
|  | 	"io" | ||||||
|  | 	"net/http" | ||||||
|  | 	"time" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  |  | ||||||
|  | 	"golang.org/x/oauth2" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type GenericOAuthService struct { | ||||||
|  | 	Config             oauth2.Config | ||||||
|  | 	Context            context.Context | ||||||
|  | 	Token              *oauth2.Token | ||||||
|  | 	Verifier           string | ||||||
|  | 	InsecureSkipVerify bool | ||||||
|  | 	UserinfoURL        string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewGenericOAuthService(config config.OAuthServiceConfig) *GenericOAuthService { | ||||||
|  | 	return &GenericOAuthService{ | ||||||
|  | 		Config: oauth2.Config{ | ||||||
|  | 			ClientID:     config.ClientID, | ||||||
|  | 			ClientSecret: config.ClientSecret, | ||||||
|  | 			RedirectURL:  config.RedirectURL, | ||||||
|  | 			Scopes:       config.Scopes, | ||||||
|  | 			Endpoint: oauth2.Endpoint{ | ||||||
|  | 				AuthURL:  config.AuthURL, | ||||||
|  | 				TokenURL: config.TokenURL, | ||||||
|  | 			}, | ||||||
|  | 		}, | ||||||
|  | 		InsecureSkipVerify: config.InsecureSkipVerify, | ||||||
|  | 		UserinfoURL:        config.UserinfoURL, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (generic *GenericOAuthService) Init() error { | ||||||
|  | 	transport := &http.Transport{ | ||||||
|  | 		TLSClientConfig: &tls.Config{ | ||||||
|  | 			InsecureSkipVerify: generic.InsecureSkipVerify, | ||||||
|  | 			MinVersion:         tls.VersionTLS12, | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	httpClient := &http.Client{ | ||||||
|  | 		Transport: transport, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	ctx := context.Background() | ||||||
|  |  | ||||||
|  | 	ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient) | ||||||
|  | 	verifier := oauth2.GenerateVerifier() | ||||||
|  |  | ||||||
|  | 	generic.Context = ctx | ||||||
|  | 	generic.Verifier = verifier | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (generic *GenericOAuthService) GenerateState() string { | ||||||
|  | 	b := make([]byte, 128) | ||||||
|  | 	_, err := rand.Read(b) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return base64.RawURLEncoding.EncodeToString(fmt.Appendf(nil, "state-%d", time.Now().UnixNano())) | ||||||
|  | 	} | ||||||
|  | 	state := base64.RawURLEncoding.EncodeToString(b) | ||||||
|  | 	return state | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (generic *GenericOAuthService) GetAuthURL(state string) string { | ||||||
|  | 	return generic.Config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(generic.Verifier)) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (generic *GenericOAuthService) VerifyCode(code string) error { | ||||||
|  | 	token, err := generic.Config.Exchange(generic.Context, code, oauth2.VerifierOption(generic.Verifier)) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	generic.Token = token | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (generic *GenericOAuthService) Userinfo() (config.Claims, error) { | ||||||
|  | 	var user config.Claims | ||||||
|  |  | ||||||
|  | 	client := generic.Config.Client(generic.Context, generic.Token) | ||||||
|  |  | ||||||
|  | 	res, err := client.Get(generic.UserinfoURL) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  | 	defer res.Body.Close() | ||||||
|  |  | ||||||
|  | 	if res.StatusCode < 200 || res.StatusCode >= 300 { | ||||||
|  | 		return user, fmt.Errorf("request failed with status: %s", res.Status) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	body, err := io.ReadAll(res.Body) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	err = json.Unmarshal(body, &user) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return user, nil | ||||||
|  | } | ||||||
							
								
								
									
										169
									
								
								internal/service/github_oauth_service.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										169
									
								
								internal/service/github_oauth_service.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,169 @@ | |||||||
|  | package service | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"context" | ||||||
|  | 	"crypto/rand" | ||||||
|  | 	"encoding/base64" | ||||||
|  | 	"encoding/json" | ||||||
|  | 	"errors" | ||||||
|  | 	"fmt" | ||||||
|  | 	"io" | ||||||
|  | 	"net/http" | ||||||
|  | 	"time" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  |  | ||||||
|  | 	"golang.org/x/oauth2" | ||||||
|  | 	"golang.org/x/oauth2/endpoints" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | var GithubOAuthScopes = []string{"user:email", "read:user"} | ||||||
|  |  | ||||||
|  | type GithubEmailResponse []struct { | ||||||
|  | 	Email   string `json:"email"` | ||||||
|  | 	Primary bool   `json:"primary"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type GithubUserInfoResponse struct { | ||||||
|  | 	Login string `json:"login"` | ||||||
|  | 	Name  string `json:"name"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type GithubOAuthService struct { | ||||||
|  | 	Config   oauth2.Config | ||||||
|  | 	Context  context.Context | ||||||
|  | 	Token    *oauth2.Token | ||||||
|  | 	Verifier string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewGithubOAuthService(config config.OAuthServiceConfig) *GithubOAuthService { | ||||||
|  | 	return &GithubOAuthService{ | ||||||
|  | 		Config: oauth2.Config{ | ||||||
|  | 			ClientID:     config.ClientID, | ||||||
|  | 			ClientSecret: config.ClientSecret, | ||||||
|  | 			RedirectURL:  config.RedirectURL, | ||||||
|  | 			Scopes:       GithubOAuthScopes, | ||||||
|  | 			Endpoint:     endpoints.GitHub, | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (github *GithubOAuthService) Init() error { | ||||||
|  | 	httpClient := &http.Client{} | ||||||
|  | 	ctx := context.Background() | ||||||
|  | 	ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient) | ||||||
|  | 	verifier := oauth2.GenerateVerifier() | ||||||
|  |  | ||||||
|  | 	github.Context = ctx | ||||||
|  | 	github.Verifier = verifier | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (github *GithubOAuthService) GenerateState() string { | ||||||
|  | 	b := make([]byte, 128) | ||||||
|  | 	_, err := rand.Read(b) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return base64.RawURLEncoding.EncodeToString(fmt.Appendf(nil, "state-%d", time.Now().UnixNano())) | ||||||
|  | 	} | ||||||
|  | 	state := base64.RawURLEncoding.EncodeToString(b) | ||||||
|  | 	return state | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (github *GithubOAuthService) GetAuthURL(state string) string { | ||||||
|  | 	return github.Config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(github.Verifier)) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (github *GithubOAuthService) VerifyCode(code string) error { | ||||||
|  | 	token, err := github.Config.Exchange(github.Context, code, oauth2.VerifierOption(github.Verifier)) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	github.Token = token | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (github *GithubOAuthService) Userinfo() (config.Claims, error) { | ||||||
|  | 	var user config.Claims | ||||||
|  |  | ||||||
|  | 	client := github.Config.Client(github.Context, github.Token) | ||||||
|  |  | ||||||
|  | 	req, err := http.NewRequest("GET", "https://api.github.com/user", nil) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	req.Header.Set("Accept", "application/vnd.github+json") | ||||||
|  |  | ||||||
|  | 	res, err := client.Do(req) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  | 	defer res.Body.Close() | ||||||
|  |  | ||||||
|  | 	if res.StatusCode < 200 || res.StatusCode >= 300 { | ||||||
|  | 		return user, fmt.Errorf("request failed with status: %s", res.Status) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	body, err := io.ReadAll(res.Body) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	var userInfo GithubUserInfoResponse | ||||||
|  |  | ||||||
|  | 	err = json.Unmarshal(body, &userInfo) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	req, err = http.NewRequest("GET", "https://api.github.com/user/emails", nil) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	req.Header.Set("Accept", "application/vnd.github+json") | ||||||
|  |  | ||||||
|  | 	res, err = client.Do(req) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  | 	defer res.Body.Close() | ||||||
|  |  | ||||||
|  | 	if res.StatusCode < 200 || res.StatusCode >= 300 { | ||||||
|  | 		return user, fmt.Errorf("request failed with status: %s", res.Status) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	body, err = io.ReadAll(res.Body) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	var emails GithubEmailResponse | ||||||
|  |  | ||||||
|  | 	err = json.Unmarshal(body, &emails) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return user, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	for _, email := range emails { | ||||||
|  | 		if email.Primary { | ||||||
|  | 			user.Email = email.Email | ||||||
|  | 			break | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if len(emails) == 0 { | ||||||
|  | 		return user, errors.New("no emails found") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Use first available email if no primary email was found | ||||||
|  | 	if user.Email == "" { | ||||||
|  | 		user.Email = emails[0].Email | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	user.PreferredUsername = userInfo.Login | ||||||
|  | 	user.Name = userInfo.Name | ||||||
|  |  | ||||||
|  | 	return user, nil | ||||||
|  | } | ||||||
							
								
								
									
										113
									
								
								internal/service/google_oauth_service.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										113
									
								
								internal/service/google_oauth_service.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,113 @@ | |||||||
|  | package service | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"context" | ||||||
|  | 	"crypto/rand" | ||||||
|  | 	"encoding/base64" | ||||||
|  | 	"encoding/json" | ||||||
|  | 	"fmt" | ||||||
|  | 	"io" | ||||||
|  | 	"net/http" | ||||||
|  | 	"strings" | ||||||
|  | 	"time" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  |  | ||||||
|  | 	"golang.org/x/oauth2" | ||||||
|  | 	"golang.org/x/oauth2/endpoints" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | var GoogleOAuthScopes = []string{"https://www.googleapis.com/auth/userinfo.email", "https://www.googleapis.com/auth/userinfo.profile"} | ||||||
|  |  | ||||||
|  | type GoogleUserInfoResponse struct { | ||||||
|  | 	Email string `json:"email"` | ||||||
|  | 	Name  string `json:"name"` | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type GoogleOAuthService struct { | ||||||
|  | 	Config   oauth2.Config | ||||||
|  | 	Context  context.Context | ||||||
|  | 	Token    *oauth2.Token | ||||||
|  | 	Verifier string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewGoogleOAuthService(config config.OAuthServiceConfig) *GoogleOAuthService { | ||||||
|  | 	return &GoogleOAuthService{ | ||||||
|  | 		Config: oauth2.Config{ | ||||||
|  | 			ClientID:     config.ClientID, | ||||||
|  | 			ClientSecret: config.ClientSecret, | ||||||
|  | 			RedirectURL:  config.RedirectURL, | ||||||
|  | 			Scopes:       GoogleOAuthScopes, | ||||||
|  | 			Endpoint:     endpoints.Google, | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (google *GoogleOAuthService) Init() error { | ||||||
|  | 	httpClient := &http.Client{} | ||||||
|  | 	ctx := context.Background() | ||||||
|  | 	ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient) | ||||||
|  | 	verifier := oauth2.GenerateVerifier() | ||||||
|  |  | ||||||
|  | 	google.Context = ctx | ||||||
|  | 	google.Verifier = verifier | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (oauth *GoogleOAuthService) GenerateState() string { | ||||||
|  | 	b := make([]byte, 128) | ||||||
|  | 	_, err := rand.Read(b) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return base64.RawURLEncoding.EncodeToString(fmt.Appendf(nil, "state-%d", time.Now().UnixNano())) | ||||||
|  | 	} | ||||||
|  | 	state := base64.RawURLEncoding.EncodeToString(b) | ||||||
|  | 	return state | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (google *GoogleOAuthService) GetAuthURL(state string) string { | ||||||
|  | 	return google.Config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(google.Verifier)) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (google *GoogleOAuthService) VerifyCode(code string) error { | ||||||
|  | 	token, err := google.Config.Exchange(google.Context, code, oauth2.VerifierOption(google.Verifier)) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	google.Token = token | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (google *GoogleOAuthService) Userinfo() (config.Claims, error) { | ||||||
|  | 	var user config.Claims | ||||||
|  |  | ||||||
|  | 	client := google.Config.Client(google.Context, google.Token) | ||||||
|  |  | ||||||
|  | 	res, err := client.Get("https://www.googleapis.com/userinfo/v2/me") | ||||||
|  | 	if err != nil { | ||||||
|  | 		return config.Claims{}, err | ||||||
|  | 	} | ||||||
|  | 	defer res.Body.Close() | ||||||
|  |  | ||||||
|  | 	if res.StatusCode < 200 || res.StatusCode >= 300 { | ||||||
|  | 		return user, fmt.Errorf("request failed with status: %s", res.Status) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	body, err := io.ReadAll(res.Body) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return config.Claims{}, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	var userInfo GoogleUserInfoResponse | ||||||
|  |  | ||||||
|  | 	err = json.Unmarshal(body, &userInfo) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return config.Claims{}, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	user.PreferredUsername = strings.Split(userInfo.Email, "@")[0] | ||||||
|  | 	user.Name = userInfo.Name | ||||||
|  | 	user.Email = userInfo.Email | ||||||
|  |  | ||||||
|  | 	return user, nil | ||||||
|  | } | ||||||
							
								
								
									
										155
									
								
								internal/service/ldap_service.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										155
									
								
								internal/service/ldap_service.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,155 @@ | |||||||
|  | package service | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"context" | ||||||
|  | 	"crypto/tls" | ||||||
|  | 	"fmt" | ||||||
|  | 	"time" | ||||||
|  |  | ||||||
|  | 	"github.com/cenkalti/backoff/v5" | ||||||
|  | 	ldapgo "github.com/go-ldap/ldap/v3" | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type LdapServiceConfig struct { | ||||||
|  | 	Address      string | ||||||
|  | 	BindDN       string | ||||||
|  | 	BindPassword string | ||||||
|  | 	BaseDN       string | ||||||
|  | 	Insecure     bool | ||||||
|  | 	SearchFilter string | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type LdapService struct { | ||||||
|  | 	Config LdapServiceConfig | ||||||
|  | 	Conn   *ldapgo.Conn | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewLdapService(config LdapServiceConfig) *LdapService { | ||||||
|  | 	return &LdapService{ | ||||||
|  | 		Config: config, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (ldap *LdapService) Init() error { | ||||||
|  | 	_, err := ldap.connect() | ||||||
|  | 	if err != nil { | ||||||
|  | 		return fmt.Errorf("failed to connect to LDAP server: %w", err) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	go func() { | ||||||
|  | 		for range time.Tick(time.Duration(5) * time.Minute) { | ||||||
|  | 			err := ldap.heartbeat() | ||||||
|  | 			if err != nil { | ||||||
|  | 				log.Error().Err(err).Msg("LDAP connection heartbeat failed") | ||||||
|  | 				if reconnectErr := ldap.reconnect(); reconnectErr != nil { | ||||||
|  | 					log.Error().Err(reconnectErr).Msg("Failed to reconnect to LDAP server") | ||||||
|  | 					continue | ||||||
|  | 				} | ||||||
|  | 				log.Info().Msg("Successfully reconnected to LDAP server") | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 	}() | ||||||
|  |  | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (ldap *LdapService) connect() (*ldapgo.Conn, error) { | ||||||
|  | 	conn, err := ldapgo.DialURL(ldap.Config.Address, ldapgo.DialWithTLSConfig(&tls.Config{ | ||||||
|  | 		InsecureSkipVerify: ldap.Config.Insecure, | ||||||
|  | 		MinVersion:         tls.VersionTLS12, | ||||||
|  | 	})) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return nil, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	err = conn.Bind(ldap.Config.BindDN, ldap.Config.BindPassword) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return nil, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// Set and return the connection | ||||||
|  | 	ldap.Conn = conn | ||||||
|  | 	return conn, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (ldap *LdapService) Search(username string) (string, error) { | ||||||
|  | 	// Escape the username to prevent LDAP injection | ||||||
|  | 	escapedUsername := ldapgo.EscapeFilter(username) | ||||||
|  | 	filter := fmt.Sprintf(ldap.Config.SearchFilter, escapedUsername) | ||||||
|  |  | ||||||
|  | 	searchRequest := ldapgo.NewSearchRequest( | ||||||
|  | 		ldap.Config.BaseDN, | ||||||
|  | 		ldapgo.ScopeWholeSubtree, ldapgo.NeverDerefAliases, 0, 0, false, | ||||||
|  | 		filter, | ||||||
|  | 		[]string{"dn"}, | ||||||
|  | 		nil, | ||||||
|  | 	) | ||||||
|  |  | ||||||
|  | 	searchResult, err := ldap.Conn.Search(searchRequest) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return "", err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if len(searchResult.Entries) != 1 { | ||||||
|  | 		return "", fmt.Errorf("multiple or no entries found for user %s", username) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	userDN := searchResult.Entries[0].DN | ||||||
|  | 	return userDN, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (ldap *LdapService) Bind(userDN string, password string) error { | ||||||
|  | 	err := ldap.Conn.Bind(userDN, password) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (ldap *LdapService) heartbeat() error { | ||||||
|  | 	log.Debug().Msg("Performing LDAP connection heartbeat") | ||||||
|  |  | ||||||
|  | 	searchRequest := ldapgo.NewSearchRequest( | ||||||
|  | 		"", | ||||||
|  | 		ldapgo.ScopeBaseObject, ldapgo.NeverDerefAliases, 0, 0, false, | ||||||
|  | 		"(objectClass=*)", | ||||||
|  | 		[]string{}, | ||||||
|  | 		nil, | ||||||
|  | 	) | ||||||
|  |  | ||||||
|  | 	_, err := ldap.Conn.Search(searchRequest) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	// No error means the connection is alive | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (ldap *LdapService) reconnect() error { | ||||||
|  | 	log.Info().Msg("Reconnecting to LDAP server") | ||||||
|  |  | ||||||
|  | 	exp := backoff.NewExponentialBackOff() | ||||||
|  | 	exp.InitialInterval = 500 * time.Millisecond | ||||||
|  | 	exp.RandomizationFactor = 0.1 | ||||||
|  | 	exp.Multiplier = 1.5 | ||||||
|  | 	exp.Reset() | ||||||
|  |  | ||||||
|  | 	operation := func() (*ldapgo.Conn, error) { | ||||||
|  | 		ldap.Conn.Close() | ||||||
|  | 		conn, err := ldap.connect() | ||||||
|  | 		if err != nil { | ||||||
|  | 			return nil, err | ||||||
|  | 		} | ||||||
|  | 		return conn, nil | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	_, err := backoff.Retry(context.TODO(), operation, backoff.WithBackOff(exp), backoff.WithMaxTries(3)) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
							
								
								
									
										76
									
								
								internal/service/oauth_broker_service.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										76
									
								
								internal/service/oauth_broker_service.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,76 @@ | |||||||
|  | package service | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"errors" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  |  | ||||||
|  | 	"github.com/rs/zerolog/log" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | type OAuthService interface { | ||||||
|  | 	Init() error | ||||||
|  | 	GenerateState() string | ||||||
|  | 	GetAuthURL(state string) string | ||||||
|  | 	VerifyCode(code string) error | ||||||
|  | 	Userinfo() (config.Claims, error) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | type OAuthBrokerService struct { | ||||||
|  | 	Services map[string]OAuthService | ||||||
|  | 	Configs  map[string]config.OAuthServiceConfig | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func NewOAuthBrokerService(configs map[string]config.OAuthServiceConfig) *OAuthBrokerService { | ||||||
|  | 	return &OAuthBrokerService{ | ||||||
|  | 		Services: make(map[string]OAuthService), | ||||||
|  | 		Configs:  configs, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (broker *OAuthBrokerService) Init() error { | ||||||
|  | 	for name, cfg := range broker.Configs { | ||||||
|  | 		switch name { | ||||||
|  | 		case "github": | ||||||
|  | 			service := NewGithubOAuthService(cfg) | ||||||
|  | 			broker.Services[name] = service | ||||||
|  | 		case "google": | ||||||
|  | 			service := NewGoogleOAuthService(cfg) | ||||||
|  | 			broker.Services[name] = service | ||||||
|  | 		default: | ||||||
|  | 			service := NewGenericOAuthService(cfg) | ||||||
|  | 			broker.Services[name] = service | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	for name, service := range broker.Services { | ||||||
|  | 		err := service.Init() | ||||||
|  | 		if err != nil { | ||||||
|  | 			log.Error().Err(err).Msgf("Failed to initialize OAuth service: %s", name) | ||||||
|  | 			return err | ||||||
|  | 		} | ||||||
|  | 		log.Info().Msgf("Initialized OAuth service: %s", name) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (broker *OAuthBrokerService) GetConfiguredServices() []string { | ||||||
|  | 	services := make([]string, 0, len(broker.Services)) | ||||||
|  | 	for name := range broker.Services { | ||||||
|  | 		services = append(services, name) | ||||||
|  | 	} | ||||||
|  | 	return services | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (broker *OAuthBrokerService) GetService(name string) (OAuthService, bool) { | ||||||
|  | 	service, exists := broker.Services[name] | ||||||
|  | 	return service, exists | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (broker *OAuthBrokerService) GetUser(service string) (config.Claims, error) { | ||||||
|  | 	oauthService, exists := broker.Services[service] | ||||||
|  | 	if !exists { | ||||||
|  | 		return config.Claims{}, errors.New("oauth service not found") | ||||||
|  | 	} | ||||||
|  | 	return oauthService.Userinfo() | ||||||
|  | } | ||||||
| @@ -1,62 +0,0 @@ | |||||||
| package types |  | ||||||
|  |  | ||||||
| // LoginQuery is the query parameters for the login endpoint |  | ||||||
| type LoginQuery struct { |  | ||||||
| 	RedirectURI string `url:"redirect_uri"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // LoginRequest is the request body for the login endpoint |  | ||||||
| type LoginRequest struct { |  | ||||||
| 	Username string `json:"username"` |  | ||||||
| 	Password string `json:"password"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // OAuthRequest is the request for the OAuth endpoint |  | ||||||
| type OAuthRequest struct { |  | ||||||
| 	Provider string `uri:"provider" binding:"required"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // UnauthorizedQuery is the query parameters for the unauthorized endpoint |  | ||||||
| type UnauthorizedQuery struct { |  | ||||||
| 	Username string `url:"username"` |  | ||||||
| 	Resource string `url:"resource"` |  | ||||||
| 	GroupErr bool   `url:"groupErr"` |  | ||||||
| 	IP       string `url:"ip"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Proxy is the uri parameters for the proxy endpoint |  | ||||||
| type Proxy struct { |  | ||||||
| 	Proxy string `uri:"proxy" binding:"required"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // User Context response is the response for the user context endpoint |  | ||||||
| type UserContextResponse struct { |  | ||||||
| 	Status      int    `json:"status"` |  | ||||||
| 	Message     string `json:"message"` |  | ||||||
| 	IsLoggedIn  bool   `json:"isLoggedIn"` |  | ||||||
| 	Username    string `json:"username"` |  | ||||||
| 	Name        string `json:"name"` |  | ||||||
| 	Email       string `json:"email"` |  | ||||||
| 	Provider    string `json:"provider"` |  | ||||||
| 	Oauth       bool   `json:"oauth"` |  | ||||||
| 	TotpPending bool   `json:"totpPending"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // App Context is the response for the app context endpoint |  | ||||||
| type AppContext struct { |  | ||||||
| 	Status                int      `json:"status"` |  | ||||||
| 	Message               string   `json:"message"` |  | ||||||
| 	ConfiguredProviders   []string `json:"configuredProviders"` |  | ||||||
| 	DisableContinue       bool     `json:"disableContinue"` |  | ||||||
| 	Title                 string   `json:"title"` |  | ||||||
| 	GenericName           string   `json:"genericName"` |  | ||||||
| 	Domain                string   `json:"domain"` |  | ||||||
| 	ForgotPasswordMessage string   `json:"forgotPasswordMessage"` |  | ||||||
| 	BackgroundImage       string   `json:"backgroundImage"` |  | ||||||
| 	OAuthAutoRedirect     string   `json:"oauthAutoRedirect"` |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Totp request is the request for the totp endpoint |  | ||||||
| type TotpRequest struct { |  | ||||||
| 	Code string `json:"code"` |  | ||||||
| } |  | ||||||
| @@ -1,53 +0,0 @@ | |||||||
| package types |  | ||||||
|  |  | ||||||
| import ( |  | ||||||
| 	"time" |  | ||||||
| 	"tinyauth/internal/oauth" |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| // User is the struct for a user |  | ||||||
| type User struct { |  | ||||||
| 	Username   string |  | ||||||
| 	Password   string |  | ||||||
| 	TotpSecret string |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // Users is a list of users |  | ||||||
| type Users []User |  | ||||||
|  |  | ||||||
| // OAuthProviders is the struct for the OAuth providers |  | ||||||
| type OAuthProviders struct { |  | ||||||
| 	Github    *oauth.OAuth |  | ||||||
| 	Google    *oauth.OAuth |  | ||||||
| 	Microsoft *oauth.OAuth |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // SessionCookie is the cookie for the session (exculding the expiry) |  | ||||||
| type SessionCookie struct { |  | ||||||
| 	Username    string |  | ||||||
| 	Name        string |  | ||||||
| 	Email       string |  | ||||||
| 	Provider    string |  | ||||||
| 	TotpPending bool |  | ||||||
| 	OAuthGroups string |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // UserContext is the context for the user |  | ||||||
| type UserContext struct { |  | ||||||
| 	Username    string |  | ||||||
| 	Name        string |  | ||||||
| 	Email       string |  | ||||||
| 	IsLoggedIn  bool |  | ||||||
| 	OAuth       bool |  | ||||||
| 	Provider    string |  | ||||||
| 	TotpPending bool |  | ||||||
| 	OAuthGroups string |  | ||||||
| 	TotpEnabled bool |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // LoginAttempt tracks information about login attempts for rate limiting |  | ||||||
| type LoginAttempt struct { |  | ||||||
| 	FailedAttempts int |  | ||||||
| 	LastAttempt    time.Time |  | ||||||
| 	LockedUntil    time.Time |  | ||||||
| } |  | ||||||
							
								
								
									
										123
									
								
								internal/utils/app_utils.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										123
									
								
								internal/utils/app_utils.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,123 @@ | |||||||
|  | package utils | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"errors" | ||||||
|  | 	"net" | ||||||
|  | 	"net/url" | ||||||
|  | 	"strings" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  |  | ||||||
|  | 	"github.com/gin-gonic/gin" | ||||||
|  |  | ||||||
|  | 	"github.com/rs/zerolog" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | // Get upper domain parses a hostname and returns the upper domain (e.g. sub1.sub2.domain.com -> sub2.domain.com) | ||||||
|  | func GetUpperDomain(appUrl string) (string, error) { | ||||||
|  | 	appUrlParsed, err := url.Parse(appUrl) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return "", err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	host := appUrlParsed.Hostname() | ||||||
|  |  | ||||||
|  | 	if netIP := net.ParseIP(host); netIP != nil { | ||||||
|  | 		return "", errors.New("IP addresses are not allowed") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	urlParts := strings.Split(host, ".") | ||||||
|  |  | ||||||
|  | 	if len(urlParts) < 2 { | ||||||
|  | 		return "", errors.New("invalid domain, must be at least second level domain") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return strings.Join(urlParts[1:], "."), nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func ParseFileToLine(content string) string { | ||||||
|  | 	lines := strings.Split(content, "\n") | ||||||
|  | 	users := make([]string, 0) | ||||||
|  |  | ||||||
|  | 	for _, line := range lines { | ||||||
|  | 		if strings.TrimSpace(line) == "" { | ||||||
|  | 			continue | ||||||
|  | 		} | ||||||
|  | 		users = append(users, strings.TrimSpace(line)) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return strings.Join(users, ",") | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func Filter[T any](slice []T, test func(T) bool) (res []T) { | ||||||
|  | 	for _, value := range slice { | ||||||
|  | 		if test(value) { | ||||||
|  | 			res = append(res, value) | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 	return res | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetContext(c *gin.Context) (config.UserContext, error) { | ||||||
|  | 	userContextValue, exists := c.Get("context") | ||||||
|  |  | ||||||
|  | 	if !exists { | ||||||
|  | 		return config.UserContext{}, errors.New("no user context in request") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	userContext, ok := userContextValue.(*config.UserContext) | ||||||
|  |  | ||||||
|  | 	if !ok { | ||||||
|  | 		return config.UserContext{}, errors.New("invalid user context in request") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return *userContext, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func IsRedirectSafe(redirectURL string, domain string) bool { | ||||||
|  | 	if redirectURL == "" { | ||||||
|  | 		return false | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	parsedURL, err := url.Parse(redirectURL) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return false | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if !parsedURL.IsAbs() { | ||||||
|  | 		return false | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	upper, err := GetUpperDomain(redirectURL) | ||||||
|  |  | ||||||
|  | 	if err != nil { | ||||||
|  | 		return false | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if upper != domain { | ||||||
|  | 		return false | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return true | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetLogLevel(level string) zerolog.Level { | ||||||
|  | 	switch strings.ToLower(level) { | ||||||
|  | 	case "trace": | ||||||
|  | 		return zerolog.TraceLevel | ||||||
|  | 	case "debug": | ||||||
|  | 		return zerolog.DebugLevel | ||||||
|  | 	case "info": | ||||||
|  | 		return zerolog.InfoLevel | ||||||
|  | 	case "warn": | ||||||
|  | 		return zerolog.WarnLevel | ||||||
|  | 	case "error": | ||||||
|  | 		return zerolog.ErrorLevel | ||||||
|  | 	case "fatal": | ||||||
|  | 		return zerolog.FatalLevel | ||||||
|  | 	case "panic": | ||||||
|  | 		return zerolog.PanicLevel | ||||||
|  | 	default: | ||||||
|  | 		return zerolog.InfoLevel | ||||||
|  | 	} | ||||||
|  | } | ||||||
							
								
								
									
										17
									
								
								internal/utils/fs_utils.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								internal/utils/fs_utils.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | |||||||
|  | package utils | ||||||
|  |  | ||||||
|  | import "os" | ||||||
|  |  | ||||||
|  | func ReadFile(file string) (string, error) { | ||||||
|  | 	_, err := os.Stat(file) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return "", err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	data, err := os.ReadFile(file) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return "", err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return string(data), nil | ||||||
|  | } | ||||||
							
								
								
									
										48
									
								
								internal/utils/label_utils.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								internal/utils/label_utils.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,48 @@ | |||||||
|  | package utils | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"net/http" | ||||||
|  | 	"strings" | ||||||
|  | 	"tinyauth/internal/config" | ||||||
|  |  | ||||||
|  | 	"github.com/traefik/paerser/parser" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | func GetLabels(labels map[string]string) (config.Labels, error) { | ||||||
|  | 	var labelsParsed config.Labels | ||||||
|  |  | ||||||
|  | 	err := parser.Decode(labels, &labelsParsed, "tinyauth", "tinyauth.users", "tinyauth.allowed", "tinyauth.headers", "tinyauth.domain", "tinyauth.basic", "tinyauth.oauth", "tinyauth.ip") | ||||||
|  | 	if err != nil { | ||||||
|  | 		return config.Labels{}, err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return labelsParsed, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func ParseHeaders(headers []string) map[string]string { | ||||||
|  | 	headerMap := make(map[string]string) | ||||||
|  | 	for _, header := range headers { | ||||||
|  | 		split := strings.SplitN(header, "=", 2) | ||||||
|  | 		if len(split) != 2 || strings.TrimSpace(split[0]) == "" || strings.TrimSpace(split[1]) == "" { | ||||||
|  | 			continue | ||||||
|  | 		} | ||||||
|  | 		key := SanitizeHeader(strings.TrimSpace(split[0])) | ||||||
|  | 		if strings.ContainsAny(key, " \t") { | ||||||
|  | 			continue | ||||||
|  | 		} | ||||||
|  | 		key = http.CanonicalHeaderKey(key) | ||||||
|  | 		value := SanitizeHeader(strings.TrimSpace(split[1])) | ||||||
|  | 		headerMap[key] = value | ||||||
|  | 	} | ||||||
|  | 	return headerMap | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func SanitizeHeader(header string) string { | ||||||
|  | 	return strings.Map(func(r rune) rune { | ||||||
|  | 		// Allow only printable ASCII characters (32-126) and safe whitespace (space, tab) | ||||||
|  | 		if r == ' ' || r == '\t' || (r >= 32 && r <= 126) { | ||||||
|  | 			return r | ||||||
|  | 		} | ||||||
|  | 		return -1 | ||||||
|  | 	}, header) | ||||||
|  | } | ||||||
							
								
								
									
										124
									
								
								internal/utils/security_utils.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										124
									
								
								internal/utils/security_utils.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,124 @@ | |||||||
|  | package utils | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"bytes" | ||||||
|  | 	"crypto/sha256" | ||||||
|  | 	"encoding/base64" | ||||||
|  | 	"errors" | ||||||
|  | 	"io" | ||||||
|  | 	"net" | ||||||
|  | 	"regexp" | ||||||
|  | 	"strings" | ||||||
|  |  | ||||||
|  | 	"github.com/google/uuid" | ||||||
|  | 	"golang.org/x/crypto/hkdf" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | func GetSecret(conf string, file string) string { | ||||||
|  | 	if conf == "" && file == "" { | ||||||
|  | 		return "" | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if conf != "" { | ||||||
|  | 		return conf | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	contents, err := ReadFile(file) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return "" | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return ParseSecretFile(contents) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func ParseSecretFile(contents string) string { | ||||||
|  | 	lines := strings.Split(contents, "\n") | ||||||
|  |  | ||||||
|  | 	for _, line := range lines { | ||||||
|  | 		if strings.TrimSpace(line) == "" { | ||||||
|  | 			continue | ||||||
|  | 		} | ||||||
|  | 		return strings.TrimSpace(line) | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return "" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetBasicAuth(username string, password string) string { | ||||||
|  | 	auth := username + ":" + password | ||||||
|  | 	return base64.StdEncoding.EncodeToString([]byte(auth)) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func DeriveKey(secret string, info string) (string, error) { | ||||||
|  | 	hash := sha256.New | ||||||
|  | 	hkdf := hkdf.New(hash, []byte(secret), nil, []byte(info)) // I am not using a salt because I just want two different keys from one secret, maybe bad practice | ||||||
|  | 	key := make([]byte, 24) | ||||||
|  |  | ||||||
|  | 	_, err := io.ReadFull(hkdf, key) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return "", err | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if bytes.Equal(key, make([]byte, 24)) { | ||||||
|  | 		return "", errors.New("derived key is empty") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	encodedKey := base64.StdEncoding.EncodeToString(key) | ||||||
|  | 	return encodedKey, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func FilterIP(filter string, ip string) (bool, error) { | ||||||
|  | 	ipAddr := net.ParseIP(ip) | ||||||
|  |  | ||||||
|  | 	if strings.Contains(filter, "/") { | ||||||
|  | 		_, cidr, err := net.ParseCIDR(filter) | ||||||
|  | 		if err != nil { | ||||||
|  | 			return false, err | ||||||
|  | 		} | ||||||
|  | 		return cidr.Contains(ipAddr), nil | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	ipFilter := net.ParseIP(filter) | ||||||
|  | 	if ipFilter == nil { | ||||||
|  | 		return false, errors.New("invalid IP address in filter") | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if ipFilter.Equal(ipAddr) { | ||||||
|  | 		return true, nil | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return false, nil | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func CheckFilter(filter string, str string) bool { | ||||||
|  | 	if len(strings.TrimSpace(filter)) == 0 { | ||||||
|  | 		return true | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	if strings.HasPrefix(filter, "/") && strings.HasSuffix(filter, "/") { | ||||||
|  | 		re, err := regexp.Compile(filter[1 : len(filter)-1]) | ||||||
|  | 		if err != nil { | ||||||
|  | 			return false | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if re.MatchString(strings.TrimSpace(str)) { | ||||||
|  | 			return true | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	filterSplit := strings.Split(filter, ",") | ||||||
|  |  | ||||||
|  | 	for _, item := range filterSplit { | ||||||
|  | 		if strings.TrimSpace(item) == strings.TrimSpace(str) { | ||||||
|  | 			return true | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return false | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GenerateIdentifier(str string) string { | ||||||
|  | 	uuid := uuid.NewSHA1(uuid.NameSpaceURL, []byte(str)) | ||||||
|  | 	uuidString := uuid.String() | ||||||
|  | 	return strings.Split(uuidString, "-")[0] | ||||||
|  | } | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user