mirror of
				https://github.com/steveiliop56/tinyauth.git
				synced 2025-10-31 06:05:43 +00:00 
			
		
		
		
	Compare commits
	
		
			21 Commits
		
	
	
		
			v3.5.0-alp
			...
			v3.6.1-bet
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 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 | 
							
								
								
									
										6
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -11,11 +11,7 @@ docker-compose.test* | ||||
| users.txt | ||||
|  | ||||
| # secret test file | ||||
| secret.txt | ||||
| secret_oauth.txt | ||||
|  | ||||
| # vscode | ||||
| .vscode | ||||
| secret* | ||||
|  | ||||
| # apple stuff | ||||
| .DS_Store | ||||
|   | ||||
							
								
								
									
										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" | ||||
|     } | ||||
|   ] | ||||
| } | ||||
| @@ -53,7 +53,7 @@ Tinyauth is licensed under the GNU General Public License v3.0. TL;DR — You ma | ||||
|  | ||||
| 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 | ||||
|  | ||||
|   | ||||
							
								
								
									
										6
									
								
								air.toml
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								air.toml
									
									
									
									
									
								
							| @@ -2,9 +2,9 @@ root = "/tinyauth" | ||||
| tmp_dir = "tmp" | ||||
|  | ||||
| [build] | ||||
| pre_cmd = ["mkdir -p internal/assets/dist", "echo 'backend running' > internal/assets/dist/index.html"] | ||||
| cmd = "CGO_ENABLED=0 go build -o ./tmp/tinyauth ." | ||||
| bin = "tmp/tinyauth" | ||||
| 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 -gcflags=\"all=-N -l\" -o tmp/tinyauth ." | ||||
| bin = "/go/bin/dlv --listen :4000 --headless=true --api-version=2 --accept-multiclient --log=true exec tmp/tinyauth --continue" | ||||
| include_ext = ["go"] | ||||
| exclude_dir = ["internal/assets/dist"] | ||||
| exclude_regex = [".*_test\\.go"] | ||||
|   | ||||
| @@ -243,7 +243,7 @@ func init() { | ||||
| 	rootCmd.Flags().Int("login-max-retries", 5, "Maximum login attempts before timeout (0 to disable).") | ||||
| 	rootCmd.Flags().Int("log-level", 1, "Log level.") | ||||
| 	rootCmd.Flags().String("app-title", "Tinyauth", "Title of the app.") | ||||
| 	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.") | ||||
| 	rootCmd.Flags().String("forgot-password-message", "", "Message to show on the forgot password page.") | ||||
| 	rootCmd.Flags().String("background-image", "/background.jpg", "Background image URL for the login page.") | ||||
| 	rootCmd.Flags().String("ldap-address", "", "LDAP server address (e.g. ldap://localhost:389).") | ||||
| 	rootCmd.Flags().String("ldap-bind-dn", "", "LDAP bind DN (e.g. uid=user,dc=example,dc=com).") | ||||
|   | ||||
| @@ -42,6 +42,7 @@ services: | ||||
|       - /var/run/docker.sock:/var/run/docker.sock | ||||
|     ports: | ||||
|       - 3000:3000 | ||||
|       - 4000:4000 | ||||
|     labels: | ||||
|       traefik.enable: true | ||||
|       traefik.http.middlewares.tinyauth.forwardauth.address: http://tinyauth-backend:3000/api/auth/traefik | ||||
|   | ||||
| @@ -10,12 +10,12 @@ | ||||
|         "@radix-ui/react-separator": "^1.1.7", | ||||
|         "@radix-ui/react-slot": "^1.2.3", | ||||
|         "@tailwindcss/vite": "^4.1.11", | ||||
|         "@tanstack/react-query": "^5.81.5", | ||||
|         "@tanstack/react-query": "^5.82.0", | ||||
|         "axios": "^1.10.0", | ||||
|         "class-variance-authority": "^0.7.1", | ||||
|         "clsx": "^2.1.1", | ||||
|         "dompurify": "^3.2.6", | ||||
|         "i18next": "^25.3.1", | ||||
|         "i18next": "^25.3.2", | ||||
|         "i18next-browser-languagedetector": "^8.2.0", | ||||
|         "i18next-resources-to-backend": "^1.2.1", | ||||
|         "input-otp": "^1.4.2", | ||||
| @@ -30,12 +30,12 @@ | ||||
|         "sonner": "^2.0.6", | ||||
|         "tailwind-merge": "^3.3.1", | ||||
|         "tailwindcss": "^4.1.11", | ||||
|         "zod": "^3.25.74", | ||||
|         "zod": "^4.0.2", | ||||
|       }, | ||||
|       "devDependencies": { | ||||
|         "@eslint/js": "^9.30.1", | ||||
|         "@tanstack/eslint-plugin-query": "^5.81.2", | ||||
|         "@types/node": "^24.0.10", | ||||
|         "@types/node": "^24.0.13", | ||||
|         "@types/react": "^19.1.8", | ||||
|         "@types/react-dom": "^19.1.6", | ||||
|         "@vitejs/plugin-react": "^4.6.0", | ||||
| @@ -46,8 +46,8 @@ | ||||
|         "prettier": "3.6.2", | ||||
|         "tw-animate-css": "^1.3.5", | ||||
|         "typescript": "~5.8.3", | ||||
|         "typescript-eslint": "^8.35.1", | ||||
|         "vite": "^7.0.2", | ||||
|         "typescript-eslint": "^8.36.0", | ||||
|         "vite": "^7.0.4", | ||||
|       }, | ||||
|     }, | ||||
|   }, | ||||
| @@ -328,9 +328,9 @@ | ||||
|  | ||||
|     "@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/query-core": ["@tanstack/query-core@5.81.5", "", {}, "sha512-ZJOgCy/z2qpZXWaj/oxvodDx07XcQa9BF92c0oINjHkoqUPsmm3uG08HpTaviviZ/N9eP1f9CM7mKSEkIo7O1Q=="], | ||||
|     "@tanstack/query-core": ["@tanstack/query-core@5.82.0", "", {}, "sha512-JrjoVuaajBQtnoWSg8iaPHaT4mW73lK2t+exxHNOSMqy0+13eKLqJgTKXKImLejQIfdAHQ6Un0njEhOvUtOd5w=="], | ||||
|  | ||||
|     "@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.82.0", "", { "dependencies": { "@tanstack/query-core": "5.82.0" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-mnk8/ofKEthFeMdhV1dV8YXRf+9HqvXAcciXkoo755d/ocfWq7N/Y9jGOzS3h7ZW9dDGwSIhs3/HANWUBsyqYg=="], | ||||
|  | ||||
|     "@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,7 +354,7 @@ | ||||
|  | ||||
|     "@types/ms": ["@types/ms@2.1.0", "", {}, "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA=="], | ||||
|  | ||||
|     "@types/node": ["@types/node@24.0.10", "", { "dependencies": { "undici-types": "~7.8.0" } }, "sha512-ENHwaH+JIRTDIEEbDK6QSQntAYGtbvdDXnMXnZaZ6k13Du1dPMmprkEHIL7ok2Wl2aZevetwTAb5S+7yIF+enA=="], | ||||
|     "@types/node": ["@types/node@24.0.13", "", { "dependencies": { "undici-types": "~7.8.0" } }, "sha512-Qm9OYVOFHFYg3wJoTSrz80hoec5Lia/dPp84do3X7dZvLikQvM1YpmvTBEdIr/e+U8HTkFjLHLnl78K/qjf+jQ=="], | ||||
|  | ||||
|     "@types/react": ["@types/react@19.1.8", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g=="], | ||||
|  | ||||
| @@ -364,9 +364,9 @@ | ||||
|  | ||||
|     "@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.36.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.36.0", "@typescript-eslint/type-utils": "8.36.0", "@typescript-eslint/utils": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.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.36.0", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg=="], | ||||
|  | ||||
|     "@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.36.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.36.0", "@typescript-eslint/types": "8.36.0", "@typescript-eslint/typescript-estree": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.0", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q=="], | ||||
|  | ||||
|     "@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=="], | ||||
|  | ||||
| @@ -374,7 +374,7 @@ | ||||
|  | ||||
|     "@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/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.36.0", "", { "dependencies": { "@typescript-eslint/typescript-estree": "8.36.0", "@typescript-eslint/utils": "8.36.0", "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-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg=="], | ||||
|  | ||||
|     "@typescript-eslint/types": ["@typescript-eslint/types@8.34.1", "", {}, "sha512-rjLVbmE7HR18kDsjNIZQHxmv9RZwlgzavryL5Lnj2ujIRTeXlKtILHgRNmQ3j4daw7zd+mQgy+uyt6Zo6I0IGA=="], | ||||
|  | ||||
| @@ -382,7 +382,7 @@ | ||||
|  | ||||
|     "@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/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.36.0", "", { "dependencies": { "@typescript-eslint/types": "8.36.0", "eslint-visitor-keys": "^4.2.1" } }, "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA=="], | ||||
|  | ||||
|     "@ungap/structured-clone": ["@ungap/structured-clone@1.3.0", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="], | ||||
|  | ||||
| @@ -582,7 +582,7 @@ | ||||
|  | ||||
|     "html-url-attributes": ["html-url-attributes@3.0.1", "", {}, "sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ=="], | ||||
|  | ||||
|     "i18next": ["i18next@25.3.1", "", { "dependencies": { "@babel/runtime": "^7.27.6" }, "peerDependencies": { "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-S4CPAx8LfMOnURnnJa8jFWvur+UX/LWcl6+61p9VV7SK2m0445JeBJ6tLD0D5SR0H29G4PYfWkEhivKG5p4RDg=="], | ||||
|     "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=="], | ||||
|  | ||||
| @@ -872,7 +872,7 @@ | ||||
|  | ||||
|     "typescript": ["typescript@5.8.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ=="], | ||||
|  | ||||
|     "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.36.0", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.36.0", "@typescript-eslint/parser": "8.36.0", "@typescript-eslint/utils": "8.36.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-fTCqxthY+h9QbEgSIBfL9iV6CvKDFuoxg6bHPNpJ9HIUzS+jy2lCEyCmGyZRWEBSaykqcDPf1SJ+BfCI8DRopA=="], | ||||
|  | ||||
|     "undici-types": ["undici-types@7.8.0", "", {}, "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw=="], | ||||
|  | ||||
| @@ -900,7 +900,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=="], | ||||
|  | ||||
|     "vite": ["vite@7.0.2", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.6", "picomatch": "^4.0.2", "postcss": "^8.5.6", "rollup": "^4.40.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-hxdyZDY1CM6SNpKI4w4lcUc3Mtkd9ej4ECWVHSMrOdSinVc2zYOAppHeGc/hzmRo3pxM5blMzkuWHOJA/3NiFw=="], | ||||
|     "vite": ["vite@7.0.4", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.6", "picomatch": "^4.0.2", "postcss": "^8.5.6", "rollup": "^4.40.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-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA=="], | ||||
|  | ||||
|     "void-elements": ["void-elements@3.1.0", "", {}, "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="], | ||||
|  | ||||
| @@ -912,7 +912,7 @@ | ||||
|  | ||||
|     "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="], | ||||
|  | ||||
|     "zod": ["zod@3.25.74", "", {}, "sha512-J8poo92VuhKjNknViHRAIuuN6li/EwFbAC8OedzI8uxpEPGiXHGQu9wemIAioIpqgfB4SySaJhdk0mH5Y4ICBg=="], | ||||
|     "zod": ["zod@4.0.2", "", {}, "sha512-X2niJNY54MGam4L6Kj0AxeedeDIi/E5QFW0On2faSX5J4/pfLk1tW+cRMIMoojnCavn/u5W/kX17e1CSGnKMxA=="], | ||||
|  | ||||
|     "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="], | ||||
|  | ||||
| @@ -958,23 +958,23 @@ | ||||
|  | ||||
|     "@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.36.0", "", { "dependencies": { "@typescript-eslint/types": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.0" } }, "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA=="], | ||||
|  | ||||
|     "@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.36.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.36.0", "@typescript-eslint/types": "8.36.0", "@typescript-eslint/typescript-estree": "8.36.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g=="], | ||||
|  | ||||
|     "@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.36.0", "", { "dependencies": { "@typescript-eslint/types": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.0" } }, "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA=="], | ||||
|  | ||||
|     "@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.36.0", "", {}, "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ=="], | ||||
|  | ||||
|     "@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/parser/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.36.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.36.0", "@typescript-eslint/tsconfig-utils": "8.36.0", "@typescript-eslint/types": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.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-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg=="], | ||||
|  | ||||
|     "@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/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/typescript-estree": ["@typescript-eslint/typescript-estree@8.36.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.36.0", "@typescript-eslint/tsconfig-utils": "8.36.0", "@typescript-eslint/types": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.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-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg=="], | ||||
|  | ||||
|     "@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.36.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.36.0", "@typescript-eslint/types": "8.36.0", "@typescript-eslint/typescript-estree": "8.36.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g=="], | ||||
|  | ||||
|     "@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=="], | ||||
|  | ||||
| @@ -982,7 +982,7 @@ | ||||
|  | ||||
|     "@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/visitor-keys/@typescript-eslint/types": ["@typescript-eslint/types@8.36.0", "", {}, "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ=="], | ||||
|  | ||||
|     "fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="], | ||||
|  | ||||
| @@ -996,7 +996,7 @@ | ||||
|  | ||||
|     "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=="], | ||||
|     "typescript-eslint/@typescript-eslint/utils": ["@typescript-eslint/utils@8.36.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.36.0", "@typescript-eslint/types": "8.36.0", "@typescript-eslint/typescript-estree": "8.36.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g=="], | ||||
|  | ||||
|     "@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=="], | ||||
|  | ||||
| @@ -1018,47 +1018,47 @@ | ||||
|  | ||||
|     "@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.36.0", "", {}, "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ=="], | ||||
|  | ||||
|     "@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.36.0", "", {}, "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ=="], | ||||
|  | ||||
|     "@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/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.36.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.36.0", "@typescript-eslint/tsconfig-utils": "8.36.0", "@typescript-eslint/types": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.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-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg=="], | ||||
|  | ||||
|     "@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/project-service": ["@typescript-eslint/project-service@8.36.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.36.0", "@typescript-eslint/types": "^8.36.0", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g=="], | ||||
|  | ||||
|     "@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/@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.36.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA=="], | ||||
|  | ||||
|     "@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/project-service": ["@typescript-eslint/project-service@8.36.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.36.0", "@typescript-eslint/types": "^8.36.0", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g=="], | ||||
|  | ||||
|     "@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/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.36.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA=="], | ||||
|  | ||||
|     "@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/@typescript-eslint/types": ["@typescript-eslint/types@8.36.0", "", {}, "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ=="], | ||||
|  | ||||
|     "@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/scope-manager": ["@typescript-eslint/scope-manager@8.36.0", "", { "dependencies": { "@typescript-eslint/types": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.0" } }, "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA=="], | ||||
|  | ||||
|     "@typescript-eslint/type-utils/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.35.1", "", {}, "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ=="], | ||||
|     "@typescript-eslint/type-utils/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.36.0", "", {}, "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ=="], | ||||
|  | ||||
|     "@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/@typescript-eslint/utils/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.36.0", "", { "dependencies": { "@typescript-eslint/types": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.0" } }, "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA=="], | ||||
|  | ||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.35.1", "", {}, "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ=="], | ||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.36.0", "", {}, "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ=="], | ||||
|  | ||||
|     "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/@typescript-eslint/utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.36.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.36.0", "@typescript-eslint/tsconfig-utils": "8.36.0", "@typescript-eslint/types": "8.36.0", "@typescript-eslint/visitor-keys": "8.36.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-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg=="], | ||||
|  | ||||
|     "@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/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.36.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.36.0", "@typescript-eslint/types": "^8.36.0", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g=="], | ||||
|  | ||||
|     "@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/@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.36.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA=="], | ||||
|  | ||||
|     "@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=="], | ||||
|  | ||||
| @@ -1068,9 +1068,9 @@ | ||||
|  | ||||
|     "@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/project-service": ["@typescript-eslint/project-service@8.36.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.36.0", "@typescript-eslint/types": "^8.36.0", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g=="], | ||||
|  | ||||
|     "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/@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.36.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <5.9.0" } }, "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA=="], | ||||
|  | ||||
|     "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/typescript-estree/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="], | ||||
|  | ||||
|   | ||||
| @@ -16,12 +16,12 @@ | ||||
|     "@radix-ui/react-separator": "^1.1.7", | ||||
|     "@radix-ui/react-slot": "^1.2.3", | ||||
|     "@tailwindcss/vite": "^4.1.11", | ||||
|     "@tanstack/react-query": "^5.81.5", | ||||
|     "@tanstack/react-query": "^5.82.0", | ||||
|     "axios": "^1.10.0", | ||||
|     "class-variance-authority": "^0.7.1", | ||||
|     "clsx": "^2.1.1", | ||||
|     "dompurify": "^3.2.6", | ||||
|     "i18next": "^25.3.1", | ||||
|     "i18next": "^25.3.2", | ||||
|     "i18next-browser-languagedetector": "^8.2.0", | ||||
|     "i18next-resources-to-backend": "^1.2.1", | ||||
|     "input-otp": "^1.4.2", | ||||
| @@ -36,12 +36,12 @@ | ||||
|     "sonner": "^2.0.6", | ||||
|     "tailwind-merge": "^3.3.1", | ||||
|     "tailwindcss": "^4.1.11", | ||||
|     "zod": "^3.25.74" | ||||
|     "zod": "^4.0.2" | ||||
|   }, | ||||
|   "devDependencies": { | ||||
|     "@eslint/js": "^9.30.1", | ||||
|     "@tanstack/eslint-plugin-query": "^5.81.2", | ||||
|     "@types/node": "^24.0.10", | ||||
|     "@types/node": "^24.0.13", | ||||
|     "@types/react": "^19.1.8", | ||||
|     "@types/react-dom": "^19.1.6", | ||||
|     "@vitejs/plugin-react": "^4.6.0", | ||||
| @@ -52,7 +52,7 @@ | ||||
|     "prettier": "3.6.2", | ||||
|     "tw-animate-css": "^1.3.5", | ||||
|     "typescript": "~5.8.3", | ||||
|     "typescript-eslint": "^8.35.1", | ||||
|     "vite": "^7.0.2" | ||||
|     "typescript-eslint": "^8.36.0", | ||||
|     "vite": "^7.0.4" | ||||
|   } | ||||
| } | ||||
| @@ -27,8 +27,8 @@ export const languages = { | ||||
|   "tr-TR": "Türkçe", | ||||
|   "uk-UA": "Українська", | ||||
|   "vi-VN": "Tiếng Việt", | ||||
|   "zh-CN": "中文", | ||||
|   "zh-TW": "中文", | ||||
|   "zh-CN": "简体中文", | ||||
|   "zh-TW": "繁體中文(台灣)", | ||||
| }; | ||||
|  | ||||
| export type SupportedLanguage = keyof typeof languages; | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| { | ||||
|     "loginTitle": "مرحبا بعودتك، قم بتسجيل الدخول باستخدام", | ||||
|     "loginTitleSimple": "Welcome back, please login", | ||||
|     "loginDivider": "Or", | ||||
|     "loginTitle": "مرحبا بعودتك، ادخل باستخدام", | ||||
|     "loginTitleSimple": "مرحبا بعودتك، سجل دخولك", | ||||
|     "loginDivider": "أو", | ||||
|     "loginUsername": "اسم المستخدم", | ||||
|     "loginPassword": "كلمة المرور", | ||||
|     "loginSubmit": "تسجيل الدخول", | ||||
| @@ -10,8 +10,8 @@ | ||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", | ||||
|     "loginSuccessTitle": "تم تسجيل الدخول", | ||||
|     "loginSuccessSubtitle": "مرحبا بعودتك!", | ||||
|     "loginOauthFailTitle": "An error occurred", | ||||
|     "loginOauthFailSubtitle": "فشل في الحصول على رابط OAuth", | ||||
|     "loginOauthFailTitle": "حدث خطأ", | ||||
|     "loginOauthFailSubtitle": "أخفق الحصول على رابط OAuth", | ||||
|     "loginOauthSuccessTitle": "إعادة توجيه", | ||||
|     "loginOauthSuccessSubtitle": "إعادة توجيه إلى مزود OAuth الخاص بك", | ||||
|     "continueRedirectingTitle": "إعادة توجيه...", | ||||
| @@ -19,7 +19,7 @@ | ||||
|     "continueInvalidRedirectTitle": "إعادة توجيه غير صالحة", | ||||
|     "continueInvalidRedirectSubtitle": "رابط إعادة التوجيه غير صالح", | ||||
|     "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": "متابعة", | ||||
|     "continueSubtitle": "انقر الزر للمتابعة إلى التطبيق الخاص بك.", | ||||
|     "logoutFailTitle": "فشل تسجيل الخروج", | ||||
| @@ -32,7 +32,7 @@ | ||||
|     "notFoundTitle": "الصفحة غير موجودة", | ||||
|     "notFoundSubtitle": "الصفحة التي تبحث عنها غير موجودة.", | ||||
|     "notFoundButton": "انتقل إلى الرئيسية", | ||||
|     "totpFailTitle": "فشل في التحقق من الرمز", | ||||
|     "totpFailTitle": "أخفق التحقق من الرمز", | ||||
|     "totpFailSubtitle": "الرجاء التحقق من الرمز الخاص بك وحاول مرة أخرى", | ||||
|     "totpSuccessTitle": "تم التحقق", | ||||
|     "totpSuccessSubtitle": "إعادة توجيه إلى تطبيقك", | ||||
| @@ -44,11 +44,11 @@ | ||||
|     "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": "حاول مجددا", | ||||
|     "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?", | ||||
|     "untrustedRedirectTitle": "إعادة توجيه غير موثوقة", | ||||
|     "untrustedRedirectSubtitle": "أنت تحاول إعادة التوجيه إلى نطاق لا يتطابق مع النطاق المكون الخاص بك (<code>{{domain}}</code>). هل أنت متأكد من أنك تريد المتابعة؟", | ||||
|     "cancelTitle": "إلغاء", | ||||
|     "forgotPasswordTitle": "Forgot your password?", | ||||
|     "forgotPasswordTitle": "نسيت كلمة المرور؟", | ||||
|     "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." | ||||
| } | ||||
| @@ -42,7 +42,7 @@ | ||||
|     "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.", | ||||
|     "unauthorizedGroupsSubtitle": "Brugeren med brugernavnet <code>{{username}}</code> er ikke i de grupper, som ressourcen <code>{{resource}}</code> kræver.", | ||||
|     "unauthorizedIpSubtitle": "Your IP address <code>{{ip}}</code> is not authorized to access the resource <code>{{resource}}</code>.", | ||||
|     "unauthorizedIpSubtitle": "Din IP adresse <code>{{ip}}</code> er ikke autoriseret til at tilgå ressourcen <code>{{resource}}</code>.", | ||||
|     "unauthorizedButton": "Prøv igen", | ||||
|     "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?", | ||||
|   | ||||
| @@ -42,7 +42,7 @@ | ||||
|     "unauthorizedResourceSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</code> δεν έχει άδεια πρόσβασης στον πόρο <code>{{resource}}</code>.", | ||||
|     "unauthorizedLoginSubtitle": "Ο χρήστης με όνομα χρήστη <code>{{username}}</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>.", | ||||
|     "unauthorizedIpSubtitle": "Η διεύθυνση IP σας <code>{{ip}}</code> δεν είναι εξουσιοδοτημένη να έχει πρόσβαση στον πόρο <code>{{resource}}</code>.", | ||||
|     "unauthorizedButton": "Προσπαθήστε ξανά", | ||||
|     "untrustedRedirectTitle": "Μη έμπιστη ανακατεύθυνση", | ||||
|     "untrustedRedirectSubtitle": "Προσπαθείτε να ανακατευθύνετε σε ένα domain που δεν ταιριάζει με τον ρυθμισμένο domain σας (<code>{{domain}}</code>). Είστε βέβαιοι ότι θέλετε να συνεχίσετε;", | ||||
|   | ||||
| @@ -50,5 +50,6 @@ | ||||
|     "forgotPasswordTitle": "Forgot your password?", | ||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||
|     "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." | ||||
| } | ||||
| @@ -50,5 +50,6 @@ | ||||
|     "forgotPasswordTitle": "Forgot your password?", | ||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||
|     "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." | ||||
| } | ||||
| @@ -10,7 +10,7 @@ | ||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", | ||||
|     "loginSuccessTitle": "Connecté", | ||||
|     "loginSuccessSubtitle": "Bienvenue!", | ||||
|     "loginOauthFailTitle": "An error occurred", | ||||
|     "loginOauthFailTitle": "Une erreur s'est produite", | ||||
|     "loginOauthFailSubtitle": "Impossible d'obtenir l'URL OAuth", | ||||
|     "loginOauthSuccessTitle": "Redirection", | ||||
|     "loginOauthSuccessSubtitle": "Redirection vers votre fournisseur OAuth", | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| { | ||||
|     "loginTitle": "Witaj ponownie, zaloguj się przez", | ||||
|     "loginTitleSimple": "Witaj ponownie, zaloguj się", | ||||
|     "loginDivider": "lub", | ||||
|     "loginDivider": "Lub", | ||||
|     "loginUsername": "Nazwa użytkownika", | ||||
|     "loginPassword": "Hasło", | ||||
|     "loginSubmit": "Zaloguj się", | ||||
|   | ||||
| @@ -1,54 +1,54 @@ | ||||
| { | ||||
|     "loginTitle": "Welcome back, login with", | ||||
|     "loginTitleSimple": "Welcome back, please login", | ||||
|     "loginDivider": "Or", | ||||
|     "loginUsername": "Username", | ||||
|     "loginPassword": "Password", | ||||
|     "loginSubmit": "Login", | ||||
|     "loginFailTitle": "Failed to log in", | ||||
|     "loginFailSubtitle": "Please check your username and password", | ||||
|     "loginFailRateLimit": "You failed to login too many times. Please try again later", | ||||
|     "loginSuccessTitle": "Logged in", | ||||
|     "loginSuccessSubtitle": "Welcome back!", | ||||
|     "loginOauthFailTitle": "An error occurred", | ||||
|     "loginOauthFailSubtitle": "Failed to get OAuth URL", | ||||
|     "loginOauthSuccessTitle": "Redirecting", | ||||
|     "loginOauthSuccessSubtitle": "Redirecting to your OAuth provider", | ||||
|     "continueRedirectingTitle": "Redirecting...", | ||||
|     "continueRedirectingSubtitle": "You should be redirected to the app soon", | ||||
|     "continueInvalidRedirectTitle": "Invalid redirect", | ||||
|     "continueInvalidRedirectSubtitle": "The redirect URL is invalid", | ||||
|     "continueInsecureRedirectTitle": "Insecure redirect", | ||||
|     "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?", | ||||
|     "continueTitle": "Continue", | ||||
|     "continueSubtitle": "Click the button to continue to your app.", | ||||
|     "logoutFailTitle": "Failed to log out", | ||||
|     "logoutFailSubtitle": "Please try again", | ||||
|     "logoutSuccessTitle": "Logged out", | ||||
|     "logoutSuccessSubtitle": "You have been logged out", | ||||
|     "logoutTitle": "Logout", | ||||
|     "logoutUsernameSubtitle": "You are currently logged in as <code>{{username}}</code>. Click the button below to logout.", | ||||
|     "logoutOauthSubtitle": "You are currently logged in as <code>{{username}}</code> using the {{provider}} OAuth provider. Click the button below to logout.", | ||||
|     "notFoundTitle": "Page not found", | ||||
|     "notFoundSubtitle": "The page you are looking for does not exist.", | ||||
|     "notFoundButton": "Go home", | ||||
|     "totpFailTitle": "Failed to verify code", | ||||
|     "totpFailSubtitle": "Please check your code and try again", | ||||
|     "totpSuccessTitle": "Verified", | ||||
|     "totpSuccessSubtitle": "Redirecting to your app", | ||||
|     "totpTitle": "Enter your TOTP code", | ||||
|     "totpSubtitle": "Please enter the code from your authenticator app.", | ||||
|     "unauthorizedTitle": "Unauthorized", | ||||
|     "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.", | ||||
|     "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", | ||||
|     "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?", | ||||
|     "cancelTitle": "Cancel", | ||||
|     "forgotPasswordTitle": "Forgot your password?", | ||||
|     "failedToFetchProvidersTitle": "Failed to load authentication providers. Please check your configuration.", | ||||
|     "errorTitle": "An error occurred", | ||||
|     "errorSubtitle": "An error occurred while trying to perform this action. Please check the console for more information." | ||||
|     "loginTitle": "歡迎回來,請用以下方式登入", | ||||
|     "loginTitleSimple": "歡迎回來,請登入", | ||||
|     "loginDivider": "或", | ||||
|     "loginUsername": "帳號", | ||||
|     "loginPassword": "密碼", | ||||
|     "loginSubmit": "登入", | ||||
|     "loginFailTitle": "登入失敗", | ||||
|     "loginFailSubtitle": "請檢查您的帳號與密碼", | ||||
|     "loginFailRateLimit": "登入失敗次數過多,請稍後再試", | ||||
|     "loginSuccessTitle": "登入成功", | ||||
|     "loginSuccessSubtitle": "歡迎回來!", | ||||
|     "loginOauthFailTitle": "發生錯誤", | ||||
|     "loginOauthFailSubtitle": "無法取得 OAuth 網址", | ||||
|     "loginOauthSuccessTitle": "重新導向中", | ||||
|     "loginOauthSuccessSubtitle": "正在將您重新導向至 OAuth 供應商", | ||||
|     "continueRedirectingTitle": "重新導向中...", | ||||
|     "continueRedirectingSubtitle": "您即將被重新導向至應用程式", | ||||
|     "continueInvalidRedirectTitle": "無效的重新導向", | ||||
|     "continueInvalidRedirectSubtitle": "重新導向的網址無效", | ||||
|     "continueInsecureRedirectTitle": "不安全的重新導向", | ||||
|     "continueInsecureRedirectSubtitle": "您正嘗試從安全的 <code>https</code> 重新導向至不安全的 <code>http</code>。您確定要繼續嗎?", | ||||
|     "continueTitle": "繼續", | ||||
|     "continueSubtitle": "點擊按鈕以繼續前往您的應用程式。", | ||||
|     "logoutFailTitle": "登出失敗", | ||||
|     "logoutFailSubtitle": "請再試一次", | ||||
|     "logoutSuccessTitle": "登出成功", | ||||
|     "logoutSuccessSubtitle": "您已成功登出", | ||||
|     "logoutTitle": "登出", | ||||
|     "logoutUsernameSubtitle": "您目前以 <code>{{username}}</code> 的身分登入。點擊下方按鈕以登出。", | ||||
|     "logoutOauthSubtitle": "您目前使用 {{provider}} OAuth 供應商並以 <code>{{username}}</code> 的身分登入。點擊下方按鈕以登出。", | ||||
|     "notFoundTitle": "找不到頁面", | ||||
|     "notFoundSubtitle": "您要尋找的頁面不存在。", | ||||
|     "notFoundButton": "回到首頁", | ||||
|     "totpFailTitle": "驗證失敗", | ||||
|     "totpFailSubtitle": "請檢查您的驗證碼並再試一次", | ||||
|     "totpSuccessTitle": "驗證成功", | ||||
|     "totpSuccessSubtitle": "正在重新導向至您的應用程式", | ||||
|     "totpTitle": "輸入您的 TOTP 驗證碼", | ||||
|     "totpSubtitle": "請輸入您驗證器應用程式中的代碼。", | ||||
|     "unauthorizedTitle": "未經授權", | ||||
|     "unauthorizedResourceSubtitle": "使用者 <code>{{username}}</code> 未被授權存取資源 <code>{{resource}}</code>。", | ||||
|     "unauthorizedLoginSubtitle": "使用者 <code>{{username}}</code> 未被授權登入。", | ||||
|     "unauthorizedGroupsSubtitle": "使用者 <code>{{username}}</code> 不在存取資源 <code>{{resource}}</code> 所需的群組中。", | ||||
|     "unauthorizedIpSubtitle": "您的 IP 位址 <code>{{ip}}</code> 未被授權存取資源 <code>{{resource}}</code>。", | ||||
|     "unauthorizedButton": "再試一次", | ||||
|     "untrustedRedirectTitle": "不受信任的重新導向", | ||||
|     "untrustedRedirectSubtitle": "您正嘗試重新導向至的網域與您設定的網域 (<code>{{domain}}</code>) 不符。您確定要繼續嗎?", | ||||
|     "cancelTitle": "取消", | ||||
|     "forgotPasswordTitle": "忘記密碼?", | ||||
|     "failedToFetchProvidersTitle": "載入驗證供應商失敗。請檢查您的設定。", | ||||
|     "errorTitle": "發生錯誤", | ||||
|     "errorSubtitle": "執行此操作時發生錯誤。請檢查主控台以獲取更多資訊。" | ||||
| } | ||||
| @@ -17,7 +17,7 @@ export const ForgotPasswordPage = () => { | ||||
|       <CardHeader> | ||||
|         <CardTitle className="text-3xl">{t("forgotPasswordTitle")}</CardTitle> | ||||
|         <CardDescription> | ||||
|           <Markdown>{forgotPasswordMessage}</Markdown> | ||||
|           <Markdown>{forgotPasswordMessage !== "" ? forgotPasswordMessage : t('forgotPasswordMessage')}</Markdown> | ||||
|         </CardDescription> | ||||
|       </CardHeader> | ||||
|     </Card> | ||||
|   | ||||
							
								
								
									
										14
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								go.mod
									
									
									
									
									
								
							| @@ -12,7 +12,7 @@ require ( | ||||
| 	github.com/spf13/cobra v1.9.1 | ||||
| 	github.com/spf13/viper v1.20.1 | ||||
| 	github.com/traefik/paerser v0.2.2 | ||||
| 	golang.org/x/crypto v0.39.0 | ||||
| 	golang.org/x/crypto v0.40.0 | ||||
| ) | ||||
|  | ||||
| require ( | ||||
| @@ -31,7 +31,7 @@ require ( | ||||
| 	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/sdk v1.34.0 // indirect | ||||
| 	golang.org/x/term v0.32.0 // indirect | ||||
| 	golang.org/x/term v0.33.0 // indirect | ||||
| 	gotest.tools/v3 v3.5.2 // indirect | ||||
| 	rsc.io/qr v0.2.0 // indirect | ||||
| ) | ||||
| @@ -53,7 +53,7 @@ require ( | ||||
| 	github.com/charmbracelet/x/term v0.2.1 // indirect | ||||
| 	github.com/cloudwego/base64x v0.1.4 // indirect | ||||
| 	github.com/distribution/reference v0.6.0 // indirect | ||||
| 	github.com/docker/docker v28.3.1+incompatible | ||||
| 	github.com/docker/docker v28.3.2+incompatible | ||||
| 	github.com/docker/go-connections v0.5.0 // indirect | ||||
| 	github.com/docker/go-units v0.5.0 // indirect | ||||
| 	github.com/dustin/go-humanize v1.0.1 // indirect | ||||
| @@ -109,11 +109,11 @@ require ( | ||||
| 	go.uber.org/atomic v1.9.0 // indirect | ||||
| 	go.uber.org/multierr v1.9.0 // indirect | ||||
| 	golang.org/x/arch v0.13.0 // indirect | ||||
| 	golang.org/x/net v0.38.0 // indirect | ||||
| 	golang.org/x/net v0.41.0 // indirect | ||||
| 	golang.org/x/oauth2 v0.30.0 | ||||
| 	golang.org/x/sync v0.15.0 // indirect | ||||
| 	golang.org/x/sys v0.33.0 // indirect | ||||
| 	golang.org/x/text v0.26.0 // indirect | ||||
| 	golang.org/x/sync v0.16.0 // indirect | ||||
| 	golang.org/x/sys v0.34.0 // indirect | ||||
| 	golang.org/x/text v0.27.0 // indirect | ||||
| 	google.golang.org/protobuf v1.36.3 // indirect | ||||
| 	gopkg.in/yaml.v3 v3.0.1 // indirect | ||||
| ) | ||||
|   | ||||
							
								
								
									
										28
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										28
									
								
								go.sum
									
									
									
									
									
								
							| @@ -72,8 +72,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/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/docker/docker v28.3.1+incompatible h1:20+BmuA9FXlCX4ByQ0vYJcUEnOmRM6XljDnFWR+jCyY= | ||||
| github.com/docker/docker v28.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= | ||||
| github.com/docker/docker v28.3.2+incompatible h1:wn66NJ6pWB1vBZIilP8G3qQPqHy5XymfYn5vsqeA5oA= | ||||
| github.com/docker/docker v28.3.2+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/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= | ||||
| github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= | ||||
| @@ -297,8 +297,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-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||
| 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.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= | ||||
| golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM= | ||||
| golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY= | ||||
| 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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||||
| @@ -307,15 +307,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-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.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= | ||||
| golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= | ||||
| golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= | ||||
| golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= | ||||
| 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/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-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||
| golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= | ||||
| golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= | ||||
| golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= | ||||
| 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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| @@ -325,14 +325,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.6.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.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= | ||||
| golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= | ||||
| golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= | ||||
| golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= | ||||
| golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= | ||||
| golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg= | ||||
| golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0= | ||||
| 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.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= | ||||
| golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= | ||||
| golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= | ||||
| golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= | ||||
| 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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||
|   | ||||
| @@ -233,8 +233,8 @@ func (auth *Auth) RecordLoginAttempt(identifier string, success bool) { | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (auth *Auth) EmailWhitelisted(emailSrc string) bool { | ||||
| 	return utils.CheckWhitelist(auth.Config.OauthWhitelist, emailSrc) | ||||
| func (auth *Auth) EmailWhitelisted(email string) bool { | ||||
| 	return utils.CheckFilter(auth.Config.OauthWhitelist, email) | ||||
| } | ||||
|  | ||||
| func (auth *Auth) CreateSessionCookie(c *gin.Context, data *types.SessionCookie) error { | ||||
| @@ -368,13 +368,13 @@ func (auth *Auth) ResourceAllowed(c *gin.Context, context types.UserContext, lab | ||||
| 	// Check if oauth is allowed | ||||
| 	if context.OAuth { | ||||
| 		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") | ||||
|  | ||||
| 	return utils.CheckWhitelist(labels.Users, context.Username) | ||||
| 	return utils.CheckFilter(labels.Users, context.Username) | ||||
| } | ||||
|  | ||||
| func (auth *Auth) OAuthGroup(c *gin.Context, context types.UserContext, labels types.Labels) bool { | ||||
| @@ -394,7 +394,7 @@ func (auth *Auth) OAuthGroup(c *gin.Context, context types.UserContext, labels t | ||||
|  | ||||
| 	// For every group check if it is in the required groups | ||||
| 	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 | ||||
| 		} | ||||
| @@ -452,10 +452,7 @@ func (auth *Auth) GetBasicAuth(c *gin.Context) *types.User { | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (auth *Auth) CheckIP(c *gin.Context, labels types.Labels) bool { | ||||
| 	// Get the IP address from the request | ||||
| 	ip := c.ClientIP() | ||||
|  | ||||
| func (auth *Auth) CheckIP(labels types.Labels, ip string) bool { | ||||
| 	// Check if the IP is in block list | ||||
| 	for _, blocked := range labels.IP.Block { | ||||
| 		res, err := utils.FilterIP(blocked, ip) | ||||
| @@ -492,3 +489,22 @@ func (auth *Auth) CheckIP(c *gin.Context, labels types.Labels) bool { | ||||
|  | ||||
| 	return true | ||||
| } | ||||
|  | ||||
| func (auth *Auth) BypassedIP(labels types.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 | ||||
| } | ||||
|   | ||||
| @@ -69,7 +69,7 @@ func (docker *Docker) DockerConnected() bool { | ||||
| 	return err == nil | ||||
| } | ||||
|  | ||||
| func (docker *Docker) GetLabels(id string, domain string) (types.Labels, error) { | ||||
| func (docker *Docker) GetLabels(app string, domain string) (types.Labels, error) { | ||||
| 	// Check if we have access to the Docker API | ||||
| 	isConnected := docker.DockerConnected() | ||||
|  | ||||
| @@ -112,9 +112,16 @@ func (docker *Docker) GetLabels(id string, domain string) (types.Labels, error) | ||||
| 			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") | ||||
| 		// Check if the container matches the ID or domain | ||||
| 		for _, lDomain := range labels.Domain { | ||||
| 			if lDomain == 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 | ||||
| 		} | ||||
| 	} | ||||
|   | ||||
| @@ -96,11 +96,29 @@ func (h *Handlers) AuthHandler(c *gin.Context) { | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	// Check if the IP is allowed/blocked | ||||
| 	// Get client IP | ||||
| 	ip := c.ClientIP() | ||||
| 	if !h.Auth.CheckIP(c, labels) { | ||||
| 		log.Warn().Str("ip", ip).Msg("IP not allowed") | ||||
|  | ||||
| 	// Check if the IP is in bypass list | ||||
| 	if h.Auth.BypassedIP(labels, ip) { | ||||
| 		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.Username != "" && utils.GetSecret(labels.Basic.Password.Plain, labels.Basic.Password.File) != "" { | ||||
| 			log.Debug().Str("username", labels.Basic.Username).Msg("Setting basic auth headers") | ||||
| 			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 | ||||
| 	} | ||||
|  | ||||
| 	// Check if the IP is allowed/blocked | ||||
| 	if !h.Auth.CheckIP(labels, ip) { | ||||
| 		if proxy.Proxy == "nginx" || !isBrowser { | ||||
| 			c.JSON(403, gin.H{ | ||||
| 				"status":  403, | ||||
| @@ -154,9 +172,9 @@ func (h *Handlers) AuthHandler(c *gin.Context) { | ||||
| 			log.Debug().Str("key", key).Msg("Setting header") | ||||
| 			c.Header(key, value) | ||||
| 		} | ||||
| 		if labels.Basic.Username != "" && labels.Basic.Password != "" { | ||||
| 		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 headers") | ||||
| 			c.Header("Authorization", fmt.Sprintf("Basic %s", utils.GetBasicAuth(labels.Basic.Username, labels.Basic.Password))) | ||||
| 			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, | ||||
| @@ -283,9 +301,9 @@ func (h *Handlers) AuthHandler(c *gin.Context) { | ||||
| 		} | ||||
|  | ||||
| 		// Set basic auth headers if configured | ||||
| 		if labels.Basic.Username != "" && labels.Basic.Password != "" { | ||||
| 		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 headers") | ||||
| 			c.Header("Authorization", fmt.Sprintf("Basic %s", utils.GetBasicAuth(labels.Basic.Username, labels.Basic.Password))) | ||||
| 			c.Header("Authorization", fmt.Sprintf("Basic %s", utils.GetBasicAuth(labels.Basic.Username, utils.GetSecret(labels.Basic.Password.Plain, labels.Basic.Password.File)))) | ||||
| 		} | ||||
|  | ||||
| 		// The user is allowed to access the app | ||||
|   | ||||
| @@ -3,38 +3,61 @@ package ldap | ||||
| import ( | ||||
| 	"crypto/tls" | ||||
| 	"fmt" | ||||
| 	"time" | ||||
| 	"tinyauth/internal/types" | ||||
|  | ||||
| 	ldapgo "github.com/go-ldap/ldap/v3" | ||||
| 	"github.com/rs/zerolog/log" | ||||
| ) | ||||
|  | ||||
| type LDAP struct { | ||||
| 	Config types.LdapConfig | ||||
| 	Conn   *ldapgo.Conn | ||||
| 	BaseDN string | ||||
| } | ||||
|  | ||||
| func NewLDAP(config types.LdapConfig) (*LDAP, error) { | ||||
| 	// Create a new LDAP instance with the provided configuration | ||||
| 	ldap := &LDAP{ | ||||
| 		Config: config, | ||||
| 	} | ||||
|  | ||||
| 	// Connect to the LDAP server | ||||
| 	conn, err := ldapgo.DialURL(config.Address, ldapgo.DialWithTLSConfig(&tls.Config{ | ||||
| 		InsecureSkipVerify: config.Insecure, | ||||
| 	if err := ldap.Connect(); err != nil { | ||||
| 		return nil, fmt.Errorf("failed to connect to LDAP server: %w", err) | ||||
| 	} | ||||
|  | ||||
| 	// Start heartbeat goroutine | ||||
| 	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") | ||||
| 			} | ||||
| 		} | ||||
| 	}() | ||||
|  | ||||
| 	return ldap, nil | ||||
| } | ||||
|  | ||||
| func (l *LDAP) Connect() error { | ||||
| 	// Connect to the LDAP server | ||||
| 	conn, err := ldapgo.DialURL(l.Config.Address, ldapgo.DialWithTLSConfig(&tls.Config{ | ||||
| 		InsecureSkipVerify: l.Config.Insecure, | ||||
| 		MinVersion:         tls.VersionTLS12, | ||||
| 	})) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	// Bind to the LDAP server with the provided credentials | ||||
| 	err = conn.Bind(config.BindDN, config.BindPassword) | ||||
| 	err = conn.Bind(l.Config.BindDN, l.Config.BindPassword) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	return &LDAP{ | ||||
| 		Config: config, | ||||
| 		Conn:   conn, | ||||
| 		BaseDN: config.BaseDN, | ||||
| 	}, nil | ||||
| 	// Store the connection in the LDAP struct | ||||
| 	l.Conn = conn | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (l *LDAP) Search(username string) (string, error) { | ||||
| @@ -44,7 +67,7 @@ func (l *LDAP) Search(username string) (string, error) { | ||||
|  | ||||
| 	// Create a search request to find the user by username | ||||
| 	searchRequest := ldapgo.NewSearchRequest( | ||||
| 		l.BaseDN, | ||||
| 		l.Config.BaseDN, | ||||
| 		ldapgo.ScopeWholeSubtree, ldapgo.NeverDerefAliases, 0, 0, false, | ||||
| 		filter, | ||||
| 		[]string{"dn"}, | ||||
| @@ -75,3 +98,25 @@ func (l *LDAP) Bind(userDN string, password string) error { | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (l *LDAP) heartbeat() error { | ||||
| 	// Perform a simple search to check if the connection is alive | ||||
| 	log.Info().Msg("Performing LDAP connection heartbeat") | ||||
|  | ||||
| 	// Create a search request to find the user by username | ||||
| 	searchRequest := ldapgo.NewSearchRequest( | ||||
| 		"", | ||||
| 		ldapgo.ScopeBaseObject, ldapgo.NeverDerefAliases, 0, 0, false, | ||||
| 		"(objectClass=*)", | ||||
| 		[]string{}, | ||||
| 		nil, | ||||
| 	) | ||||
|  | ||||
| 	// Perform the search | ||||
| 	_, err := l.Conn.Search(searchRequest) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	// No error means the connection is alive | ||||
| 	return nil | ||||
| } | ||||
|   | ||||
| @@ -8,6 +8,7 @@ import ( | ||||
| 	"reflect" | ||||
| 	"strings" | ||||
| 	"testing" | ||||
| 	"time" | ||||
| 	"tinyauth/internal/auth" | ||||
| 	"tinyauth/internal/docker" | ||||
| 	"tinyauth/internal/handlers" | ||||
| @@ -17,6 +18,7 @@ import ( | ||||
| 	"tinyauth/internal/types" | ||||
|  | ||||
| 	"github.com/magiconair/properties/assert" | ||||
| 	"github.com/pquerna/otp/totp" | ||||
| ) | ||||
|  | ||||
| // Simple server config for tests | ||||
| @@ -33,7 +35,7 @@ var handlersConfig = types.HandlersConfig{ | ||||
| 	CookieSecure:          false, | ||||
| 	Title:                 "Tinyauth", | ||||
| 	GenericName:           "Generic", | ||||
| 	ForgotPasswordMessage: "Some message", | ||||
| 	ForgotPasswordMessage: "Message", | ||||
| 	CsrfCookieName:        "tinyauth-csrf", | ||||
| 	RedirectCookieName:    "tinyauth-redirect", | ||||
| 	BackgroundImage:       "https://example.com/image.png", | ||||
| @@ -44,8 +46,8 @@ var handlersConfig = types.HandlersConfig{ | ||||
| var authConfig = types.AuthConfig{ | ||||
| 	Users:             types.Users{}, | ||||
| 	OauthWhitelist:    "", | ||||
| 	HMACSecret:        "super-secret-api-thing-for-test1", | ||||
| 	EncryptionSecret:  "super-secret-api-thing-for-test2", | ||||
| 	HMACSecret:        "4bZ9K.*:;zH=,9zG!meUxu.B5-S[7.V.", // Complex on purpose | ||||
| 	EncryptionSecret:  "\\:!R(u[Sbv6ZLm.7es)H|OqH4y}0u\\rj", | ||||
| 	CookieSecure:      false, | ||||
| 	SessionExpiry:     3600, | ||||
| 	LoginTimeout:      0, | ||||
| @@ -60,7 +62,7 @@ var hooksConfig = types.HooksConfig{ | ||||
| } | ||||
|  | ||||
| // Cookie | ||||
| var cookie string | ||||
| var cookie = "MTc1MTkyMzM5MnxiME9aTzlGQjZMNEJMdDZMc0lHMk9zcXQyME9SR1ZnUmlaYWZNcWplek5vcVNpdkdHRTZqb09YWkVUYUN6NEt4MkEyOGEyX2hFQWZEUEYtbllDX0h5eDBCb3VyT2phQlRpZWFfRFdTMGw2WUg2VWw4RGdNbEhQclotOUJjblJGaWFQcmhyaWFna0dXRWNud2c1akg5eEpLZ3JzS0pfWktscVZyckZFR1VDX0R5QjFOT0hzMTNKb18ySEMxZlluSWNxa1ByM0VhSzNyMkRtdDNORWJXVGFYSnMzWjFGa0lrZlhSTWduRmttMHhQUXN4UFhNbHFXY0lBWjBnUWpKU0xXMHRubjlKbjV0LXBGdjk0MmpJX0xMX1ZYblVJVW9LWUJoWmpNanVXNkNjamhYWlR2V29rY0RNYWkxY2lMQnpqLUI2cHMyYTZkWWgtWnlFdGN0amh2WURUeUNGT3ZLS1FJVUFIb0NWR1RPMlRtY2c9PXwerwFtb9urOXnwA02qXbLeorMloaK_paQd0in4BAesmg==" | ||||
|  | ||||
| // User | ||||
| var user = types.User{ | ||||
| @@ -68,7 +70,7 @@ var user = types.User{ | ||||
| 	Password: "$2a$10$AvGHLTYv3xiRJ0xV9xs3XeVIlkGTygI9nqIamFYB5Xu.5.0UWF7B6", // pass | ||||
| } | ||||
|  | ||||
| // We need all this to be able to test the server | ||||
| // Initialize the server for tests | ||||
| func getServer(t *testing.T) *server.Server { | ||||
| 	// Create docker service | ||||
| 	docker, err := docker.NewDocker() | ||||
| @@ -80,8 +82,9 @@ func getServer(t *testing.T) *server.Server { | ||||
| 	// Create auth service | ||||
| 	authConfig.Users = types.Users{ | ||||
| 		{ | ||||
| 			Username: user.Username, | ||||
| 			Password: user.Password, | ||||
| 			Username:   user.Username, | ||||
| 			Password:   user.Password, | ||||
| 			TotpSecret: user.TotpSecret, | ||||
| 		}, | ||||
| 	} | ||||
| 	auth := auth.NewAuth(authConfig, docker, nil) | ||||
| @@ -111,7 +114,7 @@ func TestLogin(t *testing.T) { | ||||
| 	t.Log("Testing login") | ||||
|  | ||||
| 	// Get server | ||||
| 	api := getServer(t) | ||||
| 	srv := getServer(t) | ||||
|  | ||||
| 	// Create recorder | ||||
| 	recorder := httptest.NewRecorder() | ||||
| @@ -138,18 +141,21 @@ func TestLogin(t *testing.T) { | ||||
| 	} | ||||
|  | ||||
| 	// Serve the request | ||||
| 	api.Router.ServeHTTP(recorder, req) | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) | ||||
|  | ||||
| 	// Get the cookie | ||||
| 	cookie = recorder.Result().Cookies()[0].Value | ||||
| 	// Get the result cookie | ||||
| 	cookies := recorder.Result().Cookies() | ||||
|  | ||||
| 	// Check if the cookie is set | ||||
| 	if cookie == "" { | ||||
| 	if len(cookies) == 0 { | ||||
| 		t.Fatalf("Cookie not set") | ||||
| 	} | ||||
|  | ||||
| 	// Set the cookie for further tests | ||||
| 	cookie = cookies[0].Value | ||||
| } | ||||
|  | ||||
| // Test app context | ||||
| @@ -157,7 +163,7 @@ func TestAppContext(t *testing.T) { | ||||
| 	t.Log("Testing app context") | ||||
|  | ||||
| 	// Get server | ||||
| 	api := getServer(t) | ||||
| 	srv := getServer(t) | ||||
|  | ||||
| 	// Create recorder | ||||
| 	recorder := httptest.NewRecorder() | ||||
| @@ -177,7 +183,7 @@ func TestAppContext(t *testing.T) { | ||||
| 	}) | ||||
|  | ||||
| 	// Serve the request | ||||
| 	api.Router.ServeHTTP(recorder, req) | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) | ||||
| @@ -208,7 +214,7 @@ func TestAppContext(t *testing.T) { | ||||
| 		DisableContinue:       false, | ||||
| 		Title:                 "Tinyauth", | ||||
| 		GenericName:           "Generic", | ||||
| 		ForgotPasswordMessage: "Some message", | ||||
| 		ForgotPasswordMessage: "Message", | ||||
| 		BackgroundImage:       "https://example.com/image.png", | ||||
| 		OAuthAutoRedirect:     "none", | ||||
| 		Domain:                "localhost", | ||||
| @@ -222,10 +228,13 @@ func TestAppContext(t *testing.T) { | ||||
|  | ||||
| // Test user context | ||||
| func TestUserContext(t *testing.T) { | ||||
| 	// Refresh the cookie | ||||
| 	TestLogin(t) | ||||
|  | ||||
| 	t.Log("Testing user context") | ||||
|  | ||||
| 	// Get server | ||||
| 	api := getServer(t) | ||||
| 	srv := getServer(t) | ||||
|  | ||||
| 	// Create recorder | ||||
| 	recorder := httptest.NewRecorder() | ||||
| @@ -245,7 +254,7 @@ func TestUserContext(t *testing.T) { | ||||
| 	}) | ||||
|  | ||||
| 	// Serve the request | ||||
| 	api.Router.ServeHTTP(recorder, req) | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) | ||||
| @@ -280,10 +289,13 @@ func TestUserContext(t *testing.T) { | ||||
|  | ||||
| // Test logout | ||||
| func TestLogout(t *testing.T) { | ||||
| 	// Refresh the cookie | ||||
| 	TestLogin(t) | ||||
|  | ||||
| 	t.Log("Testing logout") | ||||
|  | ||||
| 	// Get server | ||||
| 	api := getServer(t) | ||||
| 	srv := getServer(t) | ||||
|  | ||||
| 	// Create recorder | ||||
| 	recorder := httptest.NewRecorder() | ||||
| @@ -298,18 +310,212 @@ func TestLogout(t *testing.T) { | ||||
|  | ||||
| 	// Set the cookie | ||||
| 	req.AddCookie(&http.Cookie{ | ||||
| 		Name:  "tinyauth", | ||||
| 		Name:  "tinyauth-session", | ||||
| 		Value: cookie, | ||||
| 	}) | ||||
|  | ||||
| 	// Serve the request | ||||
| 	api.Router.ServeHTTP(recorder, req) | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) | ||||
|  | ||||
| 	// Check if the cookie is different (means go sessions flushed it) | ||||
| 	// Check if the cookie is different (means the cookie is gone) | ||||
| 	if recorder.Result().Cookies()[0].Value == cookie { | ||||
| 		t.Fatalf("Cookie not flushed") | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Test auth endpoint | ||||
| func TestAuth(t *testing.T) { | ||||
| 	// Refresh the cookie | ||||
| 	TestLogin(t) | ||||
|  | ||||
| 	t.Log("Testing auth endpoint") | ||||
|  | ||||
| 	// Get server | ||||
| 	srv := getServer(t) | ||||
|  | ||||
| 	// Create recorder | ||||
| 	recorder := httptest.NewRecorder() | ||||
|  | ||||
| 	// Create request | ||||
| 	req, err := http.NewRequest("GET", "/api/auth/traefik", nil) | ||||
|  | ||||
| 	// Set the accept header | ||||
| 	req.Header.Set("Accept", "text/html") | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error creating request: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Serve the request | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusTemporaryRedirect) | ||||
|  | ||||
| 	// Recreate recorder | ||||
| 	recorder = httptest.NewRecorder() | ||||
|  | ||||
| 	// Recreate the request | ||||
| 	req, err = http.NewRequest("GET", "/api/auth/traefik", nil) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error creating request: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Test with the cookie | ||||
| 	req.AddCookie(&http.Cookie{ | ||||
| 		Name:  "tinyauth-session", | ||||
| 		Value: cookie, | ||||
| 	}) | ||||
|  | ||||
| 	// Serve the request again | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) | ||||
|  | ||||
| 	// Recreate recorder | ||||
| 	recorder = httptest.NewRecorder() | ||||
|  | ||||
| 	// Recreate the request | ||||
| 	req, err = http.NewRequest("GET", "/api/auth/nginx", nil) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error creating request: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Serve the request again | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusUnauthorized) | ||||
|  | ||||
| 	// Recreate recorder | ||||
| 	recorder = httptest.NewRecorder() | ||||
|  | ||||
| 	// Recreate the request | ||||
| 	req, err = http.NewRequest("GET", "/api/auth/nginx", nil) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error creating request: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Test with the cookie | ||||
| 	req.AddCookie(&http.Cookie{ | ||||
| 		Name:  "tinyauth-session", | ||||
| 		Value: cookie, | ||||
| 	}) | ||||
|  | ||||
| 	// Serve the request again | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) | ||||
| } | ||||
|  | ||||
| func TestTOTP(t *testing.T) { | ||||
| 	t.Log("Testing TOTP") | ||||
|  | ||||
| 	// Generate totp secret | ||||
| 	key, err := totp.Generate(totp.GenerateOpts{ | ||||
| 		Issuer:      "Tinyauth", | ||||
| 		AccountName: user.Username, | ||||
| 	}) | ||||
|  | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Failed to generate TOTP secret: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Create secret | ||||
| 	secret := key.Secret() | ||||
|  | ||||
| 	// Set the user's TOTP secret | ||||
| 	user.TotpSecret = secret | ||||
|  | ||||
| 	// Get server | ||||
| 	srv := getServer(t) | ||||
|  | ||||
| 	// Create request | ||||
| 	user := types.LoginRequest{ | ||||
| 		Username: "user", | ||||
| 		Password: "pass", | ||||
| 	} | ||||
|  | ||||
| 	loginJson, err := json.Marshal(user) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error marshalling json: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Create recorder | ||||
| 	recorder := httptest.NewRecorder() | ||||
|  | ||||
| 	// Create request | ||||
| 	req, err := http.NewRequest("POST", "/api/login", strings.NewReader(string(loginJson))) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error creating request: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Serve the request | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) | ||||
|  | ||||
| 	// Set the cookie for next test | ||||
| 	cookie = recorder.Result().Cookies()[0].Value | ||||
|  | ||||
| 	// Create TOTP code | ||||
| 	code, err := totp.GenerateCode(secret, time.Now()) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Failed to generate TOTP code: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Create TOTP request | ||||
| 	totpRequest := types.TotpRequest{ | ||||
| 		Code: code, | ||||
| 	} | ||||
|  | ||||
| 	// Marshal the TOTP request | ||||
| 	totpJson, err := json.Marshal(totpRequest) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error marshalling TOTP request: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Create recorder | ||||
| 	recorder = httptest.NewRecorder() | ||||
|  | ||||
| 	// Create request | ||||
| 	req, err = http.NewRequest("POST", "/api/totp", strings.NewReader(string(totpJson))) | ||||
|  | ||||
| 	// 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 | ||||
| 	srv.Router.ServeHTTP(recorder, req) | ||||
|  | ||||
| 	// Assert | ||||
| 	assert.Equal(t, recorder.Code, http.StatusOK) | ||||
| } | ||||
|   | ||||
| @@ -34,7 +34,7 @@ type Config struct { | ||||
| 	EnvFile                 string `mapstructure:"env-file"` | ||||
| 	LoginTimeout            int    `mapstructure:"login-timeout"` | ||||
| 	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"` | ||||
| 	LdapAddress             string `mapstructure:"ldap-address"` | ||||
| 	LdapBindDN              string `mapstructure:"ldap-bind-dn"` | ||||
| @@ -109,13 +109,20 @@ type OAuthLabels struct { | ||||
| // Basic auth labels for a tinyauth protected container | ||||
| type BasicLabels struct { | ||||
| 	Username string | ||||
| 	Password string | ||||
| 	Password PassowrdLabels | ||||
| } | ||||
|  | ||||
| // PassowrdLabels is a struct that contains the password labels for a tinyauth protected container | ||||
| type PassowrdLabels struct { | ||||
| 	Plain string | ||||
| 	File  string | ||||
| } | ||||
|  | ||||
| // IP labels for a tinyauth protected container | ||||
| type IPLabels struct { | ||||
| 	Allow []string | ||||
| 	Block []string | ||||
| 	Allow  []string | ||||
| 	Block  []string | ||||
| 	Bypass []string | ||||
| } | ||||
|  | ||||
| // Labels is a struct that contains the labels for a tinyauth protected container | ||||
| @@ -123,7 +130,7 @@ type Labels struct { | ||||
| 	Users   string | ||||
| 	Allowed string | ||||
| 	Headers []string | ||||
| 	Domain  string | ||||
| 	Domain  []string | ||||
| 	Basic   BasicLabels | ||||
| 	OAuth   OAuthLabels | ||||
| 	IP      IPLabels | ||||
|   | ||||
| @@ -188,7 +188,7 @@ func ParseHeaders(headers []string) map[string]string { | ||||
| 	// Loop through the headers | ||||
| 	for _, header := range headers { | ||||
| 		split := strings.SplitN(header, "=", 2) | ||||
| 		if len(split) != 2 { | ||||
| 		if len(split) != 2 || strings.TrimSpace(split[0]) == "" || strings.TrimSpace(split[1]) == "" { | ||||
| 			log.Warn().Str("header", header).Msg("Invalid header format, skipping") | ||||
| 			continue | ||||
| 		} | ||||
| @@ -292,17 +292,17 @@ func ParseSecretFile(contents string) string { | ||||
| 	return "" | ||||
| } | ||||
|  | ||||
| // Check if a string matches a regex or a whitelist | ||||
| func CheckWhitelist(whitelist string, str string) bool { | ||||
| 	// Check if the whitelist is empty | ||||
| 	if len(strings.TrimSpace(whitelist)) == 0 { | ||||
| // Check if a string matches a regex or if it is included in a comma separated list | ||||
| func CheckFilter(filter string, str string) bool { | ||||
| 	// Check if the filter is empty | ||||
| 	if len(strings.TrimSpace(filter)) == 0 { | ||||
| 		return true | ||||
| 	} | ||||
|  | ||||
| 	// Check if the whitelist is a regex | ||||
| 	if strings.HasPrefix(whitelist, "/") && strings.HasSuffix(whitelist, "/") { | ||||
| 	// Check if the filter is a regex | ||||
| 	if strings.HasPrefix(filter, "/") && strings.HasSuffix(filter, "/") { | ||||
| 		// Create regex | ||||
| 		re, err := regexp.Compile(whitelist[1 : len(whitelist)-1]) | ||||
| 		re, err := regexp.Compile(filter[1 : len(filter)-1]) | ||||
|  | ||||
| 		// Check if there was an error | ||||
| 		if err != nil { | ||||
| @@ -316,11 +316,11 @@ func CheckWhitelist(whitelist string, str string) bool { | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	// Split the whitelist by comma | ||||
| 	whitelistSplit := strings.Split(whitelist, ",") | ||||
| 	// Split the filter by comma | ||||
| 	filterSplit := strings.Split(filter, ",") | ||||
|  | ||||
| 	// Loop through the whitelist | ||||
| 	for _, item := range whitelistSplit { | ||||
| 	// Loop through the filter items | ||||
| 	for _, item := range filterSplit { | ||||
| 		// Check if the item matches with the string | ||||
| 		if strings.TrimSpace(item) == str { | ||||
| 			return true | ||||
|   | ||||
| @@ -315,25 +315,6 @@ func TestGetLabels(t *testing.T) { | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Test the filter function | ||||
| func TestFilter(t *testing.T) { | ||||
| 	t.Log("Testing filter helper") | ||||
|  | ||||
| 	// Create variables | ||||
| 	data := []string{"", "val1", "", "val2", "", "val3", ""} | ||||
| 	expected := []string{"val1", "val2", "val3"} | ||||
|  | ||||
| 	// Test the filter function | ||||
| 	result := utils.Filter(data, func(val string) bool { | ||||
| 		return val != "" | ||||
| 	}) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if !reflect.DeepEqual(expected, result) { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Test parse user | ||||
| func TestParseUser(t *testing.T) { | ||||
| 	t.Log("Testing parse user with a valid user") | ||||
| @@ -396,108 +377,77 @@ func TestParseUser(t *testing.T) { | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Test the whitelist function | ||||
| func TestCheckWhitelist(t *testing.T) { | ||||
| 	t.Log("Testing check whitelist with a comma whitelist") | ||||
| // Test the check filter function | ||||
| func TestCheckFilter(t *testing.T) { | ||||
| 	t.Log("Testing check filter with a comma separated list") | ||||
|  | ||||
| 	// Create variables | ||||
| 	whitelist := "user1,user2,user3" | ||||
| 	filter := "user1,user2,user3" | ||||
| 	str := "user1" | ||||
| 	expected := true | ||||
|  | ||||
| 	// Test the check whitelist function | ||||
| 	result := utils.CheckWhitelist(whitelist, str) | ||||
| 	// Test the check filter function | ||||
| 	result := utils.CheckFilter(filter, str) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing check whitelist with a regex whitelist") | ||||
| 	t.Log("Testing check filter with a regex filter") | ||||
|  | ||||
| 	// Create variables | ||||
| 	whitelist = "/^user[0-9]+$/" | ||||
| 	filter = "/^user[0-9]+$/" | ||||
| 	str = "user1" | ||||
| 	expected = true | ||||
|  | ||||
| 	// Test the check whitelist function | ||||
| 	result = utils.CheckWhitelist(whitelist, str) | ||||
| 	// Test the check filter function | ||||
| 	result = utils.CheckFilter(filter, str) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing check whitelist with an empty whitelist") | ||||
| 	t.Log("Testing check filter with an empty filter") | ||||
|  | ||||
| 	// Create variables | ||||
| 	whitelist = "" | ||||
| 	filter = "" | ||||
| 	str = "user1" | ||||
| 	expected = true | ||||
|  | ||||
| 	// Test the check whitelist function | ||||
| 	result = utils.CheckWhitelist(whitelist, str) | ||||
| 	// Test the check filter function | ||||
| 	result = utils.CheckFilter(filter, str) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing check whitelist with an invalid regex whitelist") | ||||
| 	t.Log("Testing check filter with an invalid regex filter") | ||||
|  | ||||
| 	// Create variables | ||||
| 	whitelist = "/^user[0-9+$/" | ||||
| 	filter = "/^user[0-9+$/" | ||||
| 	str = "user1" | ||||
| 	expected = false | ||||
|  | ||||
| 	// Test the check whitelist function | ||||
| 	result = utils.CheckWhitelist(whitelist, str) | ||||
| 	// Test the check filter function | ||||
| 	result = utils.CheckFilter(filter, str) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing check whitelist with a non matching whitelist") | ||||
| 	t.Log("Testing check filter with a non matching list") | ||||
|  | ||||
| 	// Create variables | ||||
| 	whitelist = "user1,user2,user3" | ||||
| 	filter = "user1,user2,user3" | ||||
| 	str = "user4" | ||||
| 	expected = false | ||||
|  | ||||
| 	// Test the check whitelist function | ||||
| 	result = utils.CheckWhitelist(whitelist, str) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Test capitalize | ||||
| func TestCapitalize(t *testing.T) { | ||||
| 	t.Log("Testing capitalize with a valid string") | ||||
|  | ||||
| 	// Create variables | ||||
| 	str := "test" | ||||
| 	expected := "Test" | ||||
|  | ||||
| 	// Test the capitalize function | ||||
| 	result := utils.Capitalize(str) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing capitalize with an empty string") | ||||
|  | ||||
| 	// Create variables | ||||
| 	str = "" | ||||
| 	expected = "" | ||||
|  | ||||
| 	// Test the capitalize function | ||||
| 	result = utils.Capitalize(str) | ||||
| 	// Test the check filter function | ||||
| 	result = utils.CheckFilter(filter, str) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| @@ -535,3 +485,170 @@ func TestSanitizeHeader(t *testing.T) { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Test the parse headers function | ||||
| func TestParseHeaders(t *testing.T) { | ||||
| 	t.Log("Testing parse headers with a valid string") | ||||
|  | ||||
| 	// Create variables | ||||
| 	headers := []string{"X-Hea\x00der1=value1", "X-Header2=value\n2"} | ||||
| 	expected := map[string]string{ | ||||
| 		"X-Header1": "value1", | ||||
| 		"X-Header2": "value2", | ||||
| 	} | ||||
|  | ||||
| 	// Test the parse headers function | ||||
| 	result := utils.ParseHeaders(headers) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if !reflect.DeepEqual(expected, result) { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing parse headers with an invalid string") | ||||
|  | ||||
| 	// Create variables | ||||
| 	headers = []string{"X-Header1=", "X-Header2", "=value", "X-Header3=value3"} | ||||
| 	expected = map[string]string{"X-Header3": "value3"} | ||||
|  | ||||
| 	// Test the parse headers function | ||||
| 	result = utils.ParseHeaders(headers) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if !reflect.DeepEqual(expected, result) { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Test the parse secret file function | ||||
| func TestParseSecretFile(t *testing.T) { | ||||
| 	t.Log("Testing parse secret file with a valid file") | ||||
|  | ||||
| 	// Create variables | ||||
| 	content := "\n\n    \n\n\n  secret   \n\n    \n  " | ||||
| 	expected := "secret" | ||||
|  | ||||
| 	// Test the parse secret file function | ||||
| 	result := utils.ParseSecretFile(content) | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Test the filter IP function | ||||
| func TestFilterIP(t *testing.T) { | ||||
| 	t.Log("Testing filter IP with an IP and a valid CIDR") | ||||
|  | ||||
| 	// Create variables | ||||
| 	ip := "10.10.10.10" | ||||
| 	filter := "10.10.10.0/24" | ||||
| 	expected := true | ||||
|  | ||||
| 	// Test the filter IP function | ||||
| 	result, err := utils.FilterIP(filter, ip) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error filtering IP: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing filter IP with an IP and a valid IP") | ||||
|  | ||||
| 	// Create variables | ||||
| 	filter = "10.10.10.10" | ||||
| 	expected = true | ||||
|  | ||||
| 	// Test the filter IP function | ||||
| 	result, err = utils.FilterIP(filter, ip) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error filtering IP: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing filter IP with an IP and an non matching CIDR") | ||||
|  | ||||
| 	// Create variables | ||||
| 	filter = "10.10.15.0/24" | ||||
| 	expected = false | ||||
|  | ||||
| 	// Test the filter IP function | ||||
| 	result, err = utils.FilterIP(filter, ip) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error filtering IP: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing filter IP with a non matching IP and a valid CIDR") | ||||
|  | ||||
| 	// Create variables | ||||
| 	filter = "10.10.10.11" | ||||
| 	expected = false | ||||
|  | ||||
| 	// Test the filter IP function | ||||
| 	result, err = utils.FilterIP(filter, ip) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error filtering IP: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
|  | ||||
| 	t.Log("Testing filter IP with an IP and an invalid CIDR") | ||||
|  | ||||
| 	// Create variables | ||||
| 	filter = "10.../83" | ||||
|  | ||||
| 	// Test the filter IP function | ||||
| 	_, err = utils.FilterIP(filter, ip) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err == nil { | ||||
| 		t.Fatalf("Expected error filtering IP") | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Test the derive key function | ||||
| func TestDeriveKey(t *testing.T) { | ||||
| 	t.Log("Testing the derive key function") | ||||
|  | ||||
| 	// Create variables | ||||
| 	master := "master" | ||||
| 	info := "info" | ||||
| 	expected := "gdrdU/fXzclYjiSXRexEatVgV13qQmKl" | ||||
|  | ||||
| 	// Test the derive key function | ||||
| 	result, err := utils.DeriveKey(master, info) | ||||
|  | ||||
| 	// Check if there was an error | ||||
| 	if err != nil { | ||||
| 		t.Fatalf("Error deriving key: %v", err) | ||||
| 	} | ||||
|  | ||||
| 	// Check if the result is equal to the expected | ||||
| 	if result != expected { | ||||
| 		t.Fatalf("Expected %v, got %v", expected, result) | ||||
| 	} | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user