Compare commits
	
		
			1 Commits
		
	
	
		
			20251028
			...
			085851e169
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 085851e169 | 
							
								
								
									
										49
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										49
									
								
								.drone.yml
									
									
									
									
									
								
							| @@ -4,57 +4,10 @@ type: docker | ||||
| name: default | ||||
|  | ||||
| steps: | ||||
| # Code quality | ||||
| - name: code_quality | ||||
| - name: cargo_check | ||||
|   image: rust | ||||
|   volumes: | ||||
|     - name: rust_registry | ||||
|       path: /usr/local/cargo/registry | ||||
|   commands: | ||||
|   - rustup component add clippy | ||||
|   - cargo clippy -- -D warnings | ||||
|   - cargo test | ||||
|  | ||||
| # Build source code | ||||
| - name: compile | ||||
|   image: rust | ||||
|   depends_on: | ||||
|     - code_quality | ||||
|   when: | ||||
|     event: | ||||
|       - tag | ||||
|   volumes: | ||||
|     - name: rust_registry | ||||
|       path: /usr/local/cargo/registry | ||||
|     - name: releases | ||||
|       path: /tmp/releases | ||||
|   commands: | ||||
|     - cargo build --release | ||||
|     - ls -lah target/release/basic-oidc | ||||
|     - cp target/release/basic-oidc /tmp/releases | ||||
|  | ||||
| # Auto-release to Gitea | ||||
| - name: gitea_release | ||||
|   image: plugins/gitea-release | ||||
|   depends_on: | ||||
|     - compile | ||||
|   when: | ||||
|     event: | ||||
|       - tag | ||||
|   volumes: | ||||
|     - name: releases | ||||
|       path: /tmp/releases | ||||
|   environment: | ||||
|     PLUGIN_API_KEY: | ||||
|       from_secret: GITEA_API_KEY # needs permission write:repository | ||||
|   settings: | ||||
|     base_url: https://gitea.communiquons.org | ||||
|     files: | ||||
|       - /tmp/releases/basic-oidc | ||||
|     checksum: sha512 | ||||
|  | ||||
| volumes: | ||||
|   - name: rust_registry | ||||
|     temp: { } | ||||
|   - name: releases | ||||
|     temp: {} | ||||
							
								
								
									
										180
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										180
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							| @@ -59,7 +59,7 @@ dependencies = [ | ||||
|  "brotli", | ||||
|  "bytes", | ||||
|  "bytestring", | ||||
|  "derive_more", | ||||
|  "derive_more 2.0.1", | ||||
|  "encoding_rs", | ||||
|  "flate2", | ||||
|  "foldhash", | ||||
| @@ -74,7 +74,7 @@ dependencies = [ | ||||
|  "mime", | ||||
|  "percent-encoding", | ||||
|  "pin-project-lite", | ||||
|  "rand 0.9.2", | ||||
|  "rand 0.9.1", | ||||
|  "sha1", | ||||
|  "smallvec", | ||||
|  "tokio", | ||||
| @@ -85,15 +85,15 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "actix-identity" | ||||
| version = "0.9.0" | ||||
| version = "0.8.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "810f47733f956175bd5b2ae17ae5237fa92bd1b6a4a65f646a7240dbe9ff2728" | ||||
| checksum = "23b8ddc6f6a8b19c4016aaa13519968da9969bc3bc1c1c883cdb0f25dd6c8cf7" | ||||
| dependencies = [ | ||||
|  "actix-service", | ||||
|  "actix-session", | ||||
|  "actix-utils", | ||||
|  "actix-web", | ||||
|  "derive_more", | ||||
|  "derive_more 1.0.0", | ||||
|  "futures-core", | ||||
|  "serde", | ||||
|  "tracing", | ||||
| @@ -174,16 +174,16 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "actix-session" | ||||
| version = "0.11.0" | ||||
| version = "0.10.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "400c27fd4cdbe0082b7bbd29ac44a3070cbda1b2114138dc106ba39fe2f90dff" | ||||
| checksum = "efe6976a74f34f1b6d07a6c05aadc0ed0359304a7781c367fa5b4029418db08f" | ||||
| dependencies = [ | ||||
|  "actix-service", | ||||
|  "actix-utils", | ||||
|  "actix-web", | ||||
|  "anyhow", | ||||
|  "derive_more", | ||||
|  "rand 0.9.2", | ||||
|  "derive_more 1.0.0", | ||||
|  "rand 0.8.5", | ||||
|  "serde", | ||||
|  "serde_json", | ||||
|  "tracing", | ||||
| @@ -218,7 +218,7 @@ dependencies = [ | ||||
|  "bytestring", | ||||
|  "cfg-if", | ||||
|  "cookie", | ||||
|  "derive_more", | ||||
|  "derive_more 2.0.1", | ||||
|  "encoding_rs", | ||||
|  "foldhash", | ||||
|  "futures-core", | ||||
| @@ -339,6 +339,12 @@ dependencies = [ | ||||
|  "alloc-no-stdlib", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "android-tzdata" | ||||
| version = "0.1.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" | ||||
|  | ||||
| [[package]] | ||||
| name = "android_system_properties" | ||||
| version = "0.1.5" | ||||
| @@ -568,9 +574,9 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" | ||||
|  | ||||
| [[package]] | ||||
| name = "base64urlsafedata" | ||||
| version = "0.5.3" | ||||
| version = "0.5.2" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "215ee31f8a88f588c349ce2d20108b2ed96089b96b9c2b03775dc35dd72938e8" | ||||
| checksum = "e5913e643e4dfb43d5908e9e6f1386f8e0dfde086ecef124a6450c6195d89160" | ||||
| dependencies = [ | ||||
|  "base64 0.21.7", | ||||
|  "pastey", | ||||
| @@ -595,6 +601,7 @@ dependencies = [ | ||||
|  "clap", | ||||
|  "digest", | ||||
|  "env_logger", | ||||
|  "futures-util", | ||||
|  "include_dir", | ||||
|  "jwt-simple", | ||||
|  "lazy-regex", | ||||
| @@ -604,7 +611,7 @@ dependencies = [ | ||||
|  "mailchecker", | ||||
|  "mime_guess", | ||||
|  "qrcode-generator", | ||||
|  "rand 0.9.2", | ||||
|  "rand 0.9.1", | ||||
|  "serde", | ||||
|  "serde_json", | ||||
|  "serde_yaml", | ||||
| @@ -627,9 +634,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "bcrypt" | ||||
| version = "0.17.1" | ||||
| version = "0.17.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "abaf6da45c74385272ddf00e1ac074c7d8a6c1a1dda376902bd6a427522a8b2c" | ||||
| checksum = "92758ad6077e4c76a6cadbce5005f666df70d4f13b19976b1a8062eef880040f" | ||||
| dependencies = [ | ||||
|  "base64 0.22.1", | ||||
|  "blowfish", | ||||
| @@ -785,15 +792,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | ||||
|  | ||||
| [[package]] | ||||
| name = "chrono" | ||||
| version = "0.4.42" | ||||
| version = "0.4.41" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" | ||||
| checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" | ||||
| dependencies = [ | ||||
|  "android-tzdata", | ||||
|  "iana-time-zone", | ||||
|  "js-sys", | ||||
|  "num-traits", | ||||
|  "wasm-bindgen", | ||||
|  "windows-link 0.2.0", | ||||
|  "windows-link", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| @@ -808,9 +816,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "clap" | ||||
| version = "4.5.50" | ||||
| version = "4.5.40" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" | ||||
| checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" | ||||
| dependencies = [ | ||||
|  "clap_builder", | ||||
|  "clap_derive", | ||||
| @@ -818,9 +826,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "clap_builder" | ||||
| version = "4.5.50" | ||||
| version = "4.5.40" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" | ||||
| checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" | ||||
| dependencies = [ | ||||
|  "anstream", | ||||
|  "anstyle", | ||||
| @@ -830,9 +838,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "clap_derive" | ||||
| version = "4.5.49" | ||||
| version = "4.5.40" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" | ||||
| checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" | ||||
| dependencies = [ | ||||
|  "heck", | ||||
|  "proc-macro2", | ||||
| @@ -942,12 +950,6 @@ version = "0.8.21" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" | ||||
|  | ||||
| [[package]] | ||||
| name = "crunchy" | ||||
| version = "0.2.4" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" | ||||
|  | ||||
| [[package]] | ||||
| name = "crypto-bigint" | ||||
| version = "0.5.5" | ||||
| @@ -1026,13 +1028,34 @@ dependencies = [ | ||||
|  "powerfmt", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "derive_more" | ||||
| version = "1.0.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" | ||||
| dependencies = [ | ||||
|  "derive_more-impl 1.0.0", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "derive_more" | ||||
| version = "2.0.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" | ||||
| dependencies = [ | ||||
|  "derive_more-impl", | ||||
|  "derive_more-impl 2.0.1", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "derive_more-impl" | ||||
| version = "1.0.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" | ||||
| dependencies = [ | ||||
|  "proc-macro2", | ||||
|  "quote", | ||||
|  "syn", | ||||
|  "unicode-xid", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| @@ -1236,9 +1259,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" | ||||
|  | ||||
| [[package]] | ||||
| name = "form_urlencoded" | ||||
| version = "1.2.2" | ||||
| version = "1.2.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" | ||||
| checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" | ||||
| dependencies = [ | ||||
|  "percent-encoding", | ||||
| ] | ||||
| @@ -1398,13 +1421,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "half" | ||||
| version = "2.6.0" | ||||
| version = "1.8.3" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" | ||||
| dependencies = [ | ||||
|  "cfg-if", | ||||
|  "crunchy", | ||||
| ] | ||||
| checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" | ||||
|  | ||||
| [[package]] | ||||
| name = "hashbrown" | ||||
| @@ -1748,9 +1767,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "idna" | ||||
| version = "1.1.0" | ||||
| version = "1.0.3" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" | ||||
| checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" | ||||
| dependencies = [ | ||||
|  "idna_adapter", | ||||
|  "smallvec", | ||||
| @@ -1984,7 +2003,7 @@ dependencies = [ | ||||
|  "base64 0.22.1", | ||||
|  "bincode", | ||||
|  "log", | ||||
|  "rand 0.9.2", | ||||
|  "rand 0.9.1", | ||||
|  "reqwest", | ||||
|  "serde", | ||||
|  "serde_json", | ||||
| @@ -2032,15 +2051,15 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "log" | ||||
| version = "0.4.28" | ||||
| version = "0.4.27" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" | ||||
| checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" | ||||
|  | ||||
| [[package]] | ||||
| name = "mailchecker" | ||||
| version = "6.0.19" | ||||
| version = "6.0.17" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "abad4bc63045f04cfc55aa4c55d4ec0a890c377ce56463bfc2adc2bc059c4b84" | ||||
| checksum = "db3c69370540384985601e4adbbbc3046a658853e4909a4bd744bb390f6f9759" | ||||
| dependencies = [ | ||||
|  "fast_chemail", | ||||
|  "once_cell", | ||||
| @@ -2324,9 +2343,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "percent-encoding" | ||||
| version = "2.3.2" | ||||
| version = "2.3.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" | ||||
| checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" | ||||
|  | ||||
| [[package]] | ||||
| name = "pin-project-lite" | ||||
| @@ -2485,9 +2504,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "rand" | ||||
| version = "0.9.2" | ||||
| version = "0.9.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" | ||||
| checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" | ||||
| dependencies = [ | ||||
|  "rand_chacha 0.9.0", | ||||
|  "rand_core 0.9.3", | ||||
| @@ -2803,38 +2822,28 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "serde" | ||||
| version = "1.0.228" | ||||
| version = "1.0.219" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" | ||||
| checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" | ||||
| dependencies = [ | ||||
|  "serde_core", | ||||
|  "serde_derive", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "serde_cbor_2" | ||||
| version = "0.13.0" | ||||
| version = "0.12.0-dev" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "34aec2709de9078e077090abd848e967abab63c9fb3fdb5d4799ad359d8d482c" | ||||
| checksum = "b46d75f449e01f1eddbe9b00f432d616fbbd899b809c837d0fbc380496a0dd55" | ||||
| dependencies = [ | ||||
|  "half", | ||||
|  "serde", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "serde_core" | ||||
| version = "1.0.228" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" | ||||
| dependencies = [ | ||||
|  "serde_derive", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "serde_derive" | ||||
| version = "1.0.228" | ||||
| version = "1.0.219" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" | ||||
| checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" | ||||
| dependencies = [ | ||||
|  "proc-macro2", | ||||
|  "quote", | ||||
| @@ -2843,15 +2852,14 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "serde_json" | ||||
| version = "1.0.145" | ||||
| version = "1.0.140" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" | ||||
| checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" | ||||
| dependencies = [ | ||||
|  "itoa", | ||||
|  "memchr", | ||||
|  "ryu", | ||||
|  "serde", | ||||
|  "serde_core", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| @@ -3330,9 +3338,9 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" | ||||
|  | ||||
| [[package]] | ||||
| name = "url" | ||||
| version = "2.5.7" | ||||
| version = "2.5.4" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" | ||||
| checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" | ||||
| dependencies = [ | ||||
|  "form_urlencoded", | ||||
|  "idna", | ||||
| @@ -3372,9 +3380,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" | ||||
|  | ||||
| [[package]] | ||||
| name = "uuid" | ||||
| version = "1.18.1" | ||||
| version = "1.17.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" | ||||
| checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" | ||||
| dependencies = [ | ||||
|  "getrandom 0.3.2", | ||||
|  "js-sys", | ||||
| @@ -3516,9 +3524,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "webauthn-attestation-ca" | ||||
| version = "0.5.3" | ||||
| version = "0.5.2" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "f77a2892ec44032e6c48dad9aad1b05fada09c346ada11d8d32db119b4b4f205" | ||||
| checksum = "384e43534efe4e8f56c4eb1615a27e24d2ff29281385c843cf9f16ac1077dbdc" | ||||
| dependencies = [ | ||||
|  "base64urlsafedata", | ||||
|  "openssl", | ||||
| @@ -3530,9 +3538,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "webauthn-rs" | ||||
| version = "0.5.3" | ||||
| version = "0.5.2" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "eb7c3a2f9c8bddd524e47bbd427bcf3a28aa074de55d74470b42a91a41937b8e" | ||||
| checksum = "ed1f861a94557baeb0cf711e3e55d623c46b68f4aab7aa932562f785b8b5f1ab" | ||||
| dependencies = [ | ||||
|  "base64urlsafedata", | ||||
|  "serde", | ||||
| @@ -3544,9 +3552,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "webauthn-rs-core" | ||||
| version = "0.5.3" | ||||
| version = "0.5.2" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "19f1d80f3146382529fe70a3ab5d0feb2413a015204ed7843f9377cd39357fc4" | ||||
| checksum = "269c210cd5f183aaca860bb5733187d1dd110ebed54640f8fc1aca31a04aa4dc" | ||||
| dependencies = [ | ||||
|  "base64 0.21.7", | ||||
|  "base64urlsafedata", | ||||
| @@ -3571,9 +3579,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "webauthn-rs-proto" | ||||
| version = "0.5.3" | ||||
| version = "0.5.2" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "9e786894f89facb9aaf1c5f6559670236723c98382e045521c76f3d5ca5047bd" | ||||
| checksum = "144dbee9abb4bfad78fd283a2613f0312a0ed5955051b7864cfc98679112ae60" | ||||
| dependencies = [ | ||||
|  "base64 0.21.7", | ||||
|  "base64urlsafedata", | ||||
| @@ -3597,12 +3605,6 @@ version = "0.1.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" | ||||
|  | ||||
| [[package]] | ||||
| name = "windows-link" | ||||
| version = "0.2.0" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" | ||||
|  | ||||
| [[package]] | ||||
| name = "windows-registry" | ||||
| version = "0.4.0" | ||||
| @@ -3620,7 +3622,7 @@ version = "0.3.2" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" | ||||
| dependencies = [ | ||||
|  "windows-link 0.1.1", | ||||
|  "windows-link", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| @@ -3629,7 +3631,7 @@ version = "0.3.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" | ||||
| dependencies = [ | ||||
|  "windows-link 0.1.1", | ||||
|  "windows-link", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
|   | ||||
							
								
								
									
										27
									
								
								Cargo.toml
									
									
									
									
									
								
							
							
						
						
									
										27
									
								
								Cargo.toml
									
									
									
									
									
								
							| @@ -7,23 +7,24 @@ edition = "2024" | ||||
|  | ||||
| [dependencies] | ||||
| actix = "0.13.5" | ||||
| actix-identity = "0.9.0" | ||||
| actix-identity = "0.8.0" | ||||
| actix-web = "4.11.0" | ||||
| actix-session = { version = "0.11.0", features = ["cookie-session"] } | ||||
| actix-session = { version = "0.10.1", features = ["cookie-session"] } | ||||
| actix-remote-ip = "0.1.0" | ||||
| clap = { version = "4.5.50", features = ["derive", "env"] } | ||||
| clap = { version = "4.5.40", features = ["derive", "env"] } | ||||
| include_dir = "0.7.4" | ||||
| log = "0.4.28" | ||||
| serde_json = "1.0.145" | ||||
| log = "0.4.27" | ||||
| serde_json = "1.0.140" | ||||
| serde_yaml = "0.9.34" | ||||
| env_logger = "0.11.8" | ||||
| serde = { version = "1.0.228", features = ["derive"] } | ||||
| bcrypt = "0.17.1" | ||||
| uuid = { version = "1.18.1", features = ["v4"] } | ||||
| serde = { version = "1.0.219", features = ["derive"] } | ||||
| bcrypt = "0.17.0" | ||||
| uuid = { version = "1.17.0", features = ["v4"] } | ||||
| mime_guess = "2.0.5" | ||||
| askama = "0.14.0" | ||||
| futures-util = "0.3.31" | ||||
| urlencoding = "2.1.3" | ||||
| rand = "0.9.2" | ||||
| rand = "0.9.1" | ||||
| base64 = "0.22.1" | ||||
| jwt-simple = { version = "0.12.12", default-features = false, features = ["pure-rust"] } | ||||
| digest = "0.10.7" | ||||
| @@ -32,10 +33,10 @@ lazy-regex = "3.4.1" | ||||
| totp_rfc6238 = "0.6.1" | ||||
| base32 = "0.5.1" | ||||
| qrcode-generator = "5.0.0" | ||||
| webauthn-rs = { version = "0.5.3", features = ["danger-allow-state-serialisation"] } | ||||
| url = "2.5.7" | ||||
| webauthn-rs = { version = "0.5.2", features = ["danger-allow-state-serialisation"] } | ||||
| url = "2.5.4" | ||||
| light-openid = { version = "1.0.4", features = ["crypto-wrapper"] } | ||||
| bincode = "2.0.1" | ||||
| chrono = "0.4.42" | ||||
| chrono = "0.4.41" | ||||
| lazy_static = "1.5.0" | ||||
| mailchecker = "6.0.19" | ||||
| mailchecker = "6.0.17" | ||||
|   | ||||
| @@ -151,7 +151,7 @@ impl Handler<LocalLoginRequest> for UsersActor { | ||||
|     fn handle(&mut self, msg: LocalLoginRequest, _ctx: &mut Self::Context) -> Self::Result { | ||||
|         match self.manager.find_by_username_or_email(&msg.login) { | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to find user! {e}"); | ||||
|                 log::error!("Failed to find user! {}", e); | ||||
|                 MessageResult(LoginResult::Error) | ||||
|             } | ||||
|             Ok(None) => MessageResult(LoginResult::AccountNotFound), | ||||
| @@ -184,7 +184,7 @@ impl Handler<ProviderLoginRequest> for UsersActor { | ||||
|     fn handle(&mut self, msg: ProviderLoginRequest, _ctx: &mut Self::Context) -> Self::Result { | ||||
|         match self.manager.find_by_email(&msg.email) { | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to find user! {e}"); | ||||
|                 log::error!("Failed to find user! {}", e); | ||||
|                 MessageResult(LoginResult::Error) | ||||
|             } | ||||
|             Ok(None) => MessageResult(LoginResult::AccountNotFound), | ||||
| @@ -210,7 +210,7 @@ impl Handler<CreateAccount> for UsersActor { | ||||
|         match self.manager.create_user_account(msg.0) { | ||||
|             Ok(id) => Some(id), | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to create user account! {e}"); | ||||
|                 log::error!("Failed to create user account! {}", e); | ||||
|                 None | ||||
|             } | ||||
|         } | ||||
| @@ -227,7 +227,7 @@ impl Handler<ChangePasswordRequest> for UsersActor { | ||||
|         { | ||||
|             Ok(_) => true, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to change user password! {e:?}"); | ||||
|                 log::error!("Failed to change user password! {:?}", e); | ||||
|                 false | ||||
|             } | ||||
|         } | ||||
| @@ -241,7 +241,7 @@ impl Handler<Add2FAFactor> for UsersActor { | ||||
|         match self.manager.add_2fa_factor(&msg.0, msg.1) { | ||||
|             Ok(_) => true, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to add 2FA factor! {e}"); | ||||
|                 log::error!("Failed to add 2FA factor! {}", e); | ||||
|                 false | ||||
|             } | ||||
|         } | ||||
| @@ -255,7 +255,7 @@ impl Handler<Remove2FAFactor> for UsersActor { | ||||
|         match self.manager.remove_2fa_factor(&msg.0, msg.1) { | ||||
|             Ok(_) => true, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to remove 2FA factor! {e}"); | ||||
|                 log::error!("Failed to remove 2FA factor! {}", e); | ||||
|                 false | ||||
|             } | ||||
|         } | ||||
| @@ -272,7 +272,7 @@ impl Handler<AddSuccessful2FALogin> for UsersActor { | ||||
|         { | ||||
|             Ok(_) => true, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to save successful 2FA authentication! {e}"); | ||||
|                 log::error!("Failed to save successful 2FA authentication! {}", e); | ||||
|                 false | ||||
|             } | ||||
|         } | ||||
| @@ -309,7 +309,10 @@ impl Handler<SetAuthorizedAuthenticationSources> for UsersActor { | ||||
|         { | ||||
|             Ok(_) => true, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to set authorized authentication sources for user! {e}"); | ||||
|                 log::error!( | ||||
|                     "Failed to set authorized authentication sources for user! {}", | ||||
|                     e | ||||
|                 ); | ||||
|                 false | ||||
|             } | ||||
|         } | ||||
| @@ -322,7 +325,7 @@ impl Handler<SetGrantedClients> for UsersActor { | ||||
|         match self.manager.set_granted_2fa_clients(&msg.0, msg.1) { | ||||
|             Ok(_) => true, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to set granted 2FA clients! {e}"); | ||||
|                 log::error!("Failed to set granted 2FA clients! {}", e); | ||||
|                 false | ||||
|             } | ||||
|         } | ||||
| @@ -336,7 +339,7 @@ impl Handler<GetUserRequest> for UsersActor { | ||||
|         MessageResult(GetUserResult(match self.manager.find_by_user_id(&msg.0) { | ||||
|             Ok(r) => r, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to find user by id! {e}"); | ||||
|                 log::error!("Failed to find user by id! {}", e); | ||||
|                 None | ||||
|             } | ||||
|         })) | ||||
| @@ -350,7 +353,7 @@ impl Handler<VerifyUserPasswordRequest> for UsersActor { | ||||
|         self.manager | ||||
|             .verify_user_password(&msg.0, &msg.1) | ||||
|             .unwrap_or_else(|e| { | ||||
|                 log::error!("Failed to verify user password! {e}"); | ||||
|                 log::error!("Failed to verify user password! {}", e); | ||||
|                 false | ||||
|             }) | ||||
|     } | ||||
| @@ -364,7 +367,7 @@ impl Handler<FindUserByUsername> for UsersActor { | ||||
|             self.manager | ||||
|                 .find_by_username_or_email(&msg.0) | ||||
|                 .unwrap_or_else(|e| { | ||||
|                     log::error!("Failed to find user by username or email! {e}"); | ||||
|                     log::error!("Failed to find user by username or email! {}", e); | ||||
|                     None | ||||
|                 }), | ||||
|         )) | ||||
| @@ -378,7 +381,7 @@ impl Handler<GetAllUsers> for UsersActor { | ||||
|         match self.manager.get_entire_users_list() { | ||||
|             Ok(r) => r, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to get entire users list! {e}"); | ||||
|                 log::error!("Failed to get entire users list! {}", e); | ||||
|                 vec![] | ||||
|             } | ||||
|         } | ||||
| @@ -392,7 +395,7 @@ impl Handler<UpdateUserSettings> for UsersActor { | ||||
|         match self.manager.set_general_user_settings(msg.0) { | ||||
|             Ok(_) => true, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to update general user information! {e:?}"); | ||||
|                 log::error!("Failed to update general user information! {:?}", e); | ||||
|                 false | ||||
|             } | ||||
|         } | ||||
| @@ -406,7 +409,7 @@ impl Handler<DeleteUserRequest> for UsersActor { | ||||
|         match self.manager.delete_account(&msg.0) { | ||||
|             Ok(_) => true, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to delete user account! {e}"); | ||||
|                 log::error!("Failed to delete user account! {}", e); | ||||
|                 false | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -47,7 +47,7 @@ pub async fn auth_webauthn( | ||||
|             HttpResponse::Ok().body("You are authenticated!") | ||||
|         } | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to authenticate user using webauthn! {e:?}"); | ||||
|             log::error!("Failed to authenticate user using webauthn! {:?}", e); | ||||
|             logger.log(Action::LoginWebauthnAttempt { | ||||
|                 success: false, | ||||
|                 user_id, | ||||
|   | ||||
| @@ -190,7 +190,12 @@ pub async fn login_route( | ||||
|             } | ||||
|  | ||||
|             c => { | ||||
|                 log::warn!("Failed login for ip {remote_ip:?} /  username {login}: {c:?}"); | ||||
|                 log::warn!( | ||||
|                     "Failed login for ip {:?} /  username {}: {:?}", | ||||
|                     remote_ip, | ||||
|                     login, | ||||
|                     c | ||||
|                 ); | ||||
|                 logger.log(Action::FailedLoginWithBadCredentials(&login)); | ||||
|                 danger = Some("Login failed.".to_string()); | ||||
|  | ||||
| @@ -469,7 +474,7 @@ pub async fn login_with_webauthn( | ||||
|     let challenge = match manager.start_authentication(&user.uid, &pub_keys) { | ||||
|         Ok(c) => c, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to generate webauthn challenge! {e:?}"); | ||||
|             log::error!("Failed to generate webauthn challenge! {:?}", e); | ||||
|             return HttpResponse::InternalServerError().body(build_fatal_error_page( | ||||
|                 "Failed to generate webauthn challenge", | ||||
|             )); | ||||
| @@ -479,7 +484,7 @@ pub async fn login_with_webauthn( | ||||
|     let challenge_json = match serde_json::to_string(&challenge.login_challenge) { | ||||
|         Ok(r) => r, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to serialize challenge! {e:?}"); | ||||
|             log::error!("Failed to serialize challenge! {:?}", e); | ||||
|             return HttpResponse::InternalServerError().body("Failed to serialize challenge!"); | ||||
|         } | ||||
|     }; | ||||
|   | ||||
| @@ -111,7 +111,12 @@ pub struct AuthorizeQuery { | ||||
| } | ||||
|  | ||||
| fn error_redirect(query: &AuthorizeQuery, error: &str, description: &str) -> HttpResponse { | ||||
|     log::warn!("Failed to process sign in request ({error} => {description}): {query:?}"); | ||||
|     log::warn!( | ||||
|         "Failed to process sign in request ({} => {}): {:?}", | ||||
|         error, | ||||
|         description, | ||||
|         query | ||||
|     ); | ||||
|     HttpResponse::Found() | ||||
|         .append_header(( | ||||
|             "Location", | ||||
| @@ -238,7 +243,7 @@ pub async fn authorize( | ||||
|                 .await | ||||
|                 .unwrap(); | ||||
|  | ||||
|             log::trace!("New OpenID session: {session:#?}"); | ||||
|             log::trace!("New OpenID session: {:#?}", session); | ||||
|             logger.log(Action::NewOpenIDSession { client: &client }); | ||||
|  | ||||
|             Ok(HttpResponse::Found() | ||||
| @@ -314,7 +319,12 @@ struct ErrorResponse { | ||||
| } | ||||
|  | ||||
| pub fn error_response<D: Debug>(query: &D, error: &str, description: &str) -> HttpResponse { | ||||
|     log::warn!("request failed: {error} - {description} => '{query:#?}'"); | ||||
|     log::warn!( | ||||
|         "request failed: {} - {} => '{:#?}'", | ||||
|         error, | ||||
|         description, | ||||
|         query | ||||
|     ); | ||||
|     HttpResponse::BadRequest().json(ErrorResponse { | ||||
|         error: error.to_string(), | ||||
|         error_description: description.to_string(), | ||||
| @@ -379,7 +389,7 @@ pub async fn token( | ||||
|                 let decode = String::from_utf8_lossy(&match BASE64_STANDARD.decode(token) { | ||||
|                     Ok(d) => d, | ||||
|                     Err(e) => { | ||||
|                         log::error!("Failed to decode authorization header: {e:?}"); | ||||
|                         log::error!("Failed to decode authorization header: {:?}", e); | ||||
|                         return Ok(error_response( | ||||
|                             &query, | ||||
|                             "invalid_request", | ||||
|   | ||||
| @@ -96,14 +96,14 @@ pub async fn start_login( | ||||
|     let config = match ProviderConfigurationHelper::get_configuration(&provider).await { | ||||
|         Ok(c) => c, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to load provider configuration! {e}"); | ||||
|             log::error!("Failed to load provider configuration! {}", e); | ||||
|             return HttpResponse::InternalServerError().body(build_fatal_error_page( | ||||
|                 "Failed to load provider configuration!", | ||||
|             )); | ||||
|         } | ||||
|     }; | ||||
|  | ||||
|     log::debug!("Provider configuration: {config:?}"); | ||||
|     log::debug!("Provider configuration: {:?}", config); | ||||
|  | ||||
|     let url = config.auth_url(&provider, &state); | ||||
|     log::debug!("Redirect user on {url} for authentication",); | ||||
| @@ -210,7 +210,7 @@ pub async fn finish_login( | ||||
|     let provider_config = match ProviderConfigurationHelper::get_configuration(&provider).await { | ||||
|         Ok(c) => c, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to load provider configuration! {e}"); | ||||
|             log::error!("Failed to load provider configuration! {}", e); | ||||
|             return HttpResponse::InternalServerError().body(build_fatal_error_page( | ||||
|                 "Failed to load provider configuration!", | ||||
|             )); | ||||
| @@ -222,7 +222,7 @@ pub async fn finish_login( | ||||
|     let token = match token { | ||||
|         Ok(t) => t, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to retrieve login token! {e:?}"); | ||||
|             log::error!("Failed to retrieve login token! {:?}", e); | ||||
|  | ||||
|             bruteforce | ||||
|                 .send(bruteforce_actor::RecordFailedAttempt { | ||||
| @@ -247,7 +247,7 @@ pub async fn finish_login( | ||||
|     let user_info = match provider_config.get_userinfo(&token).await { | ||||
|         Ok(info) => info, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to retrieve user information! {e:?}"); | ||||
|             log::error!("Failed to retrieve user information! {:?}", e); | ||||
|  | ||||
|             logger.log(Action::ProviderFailedGetUserInfo { | ||||
|                 provider: &provider, | ||||
|   | ||||
| @@ -94,7 +94,7 @@ pub async fn save_webauthn_factor( | ||||
|     let key = match manager.finish_registration(&user, &form.0.opaque_state, form.0.credential) { | ||||
|         Ok(k) => k, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to register security key! {e:?}"); | ||||
|             log::error!("Failed to register security key! {:?}", e); | ||||
|             return HttpResponse::InternalServerError().body("Failed to register key!"); | ||||
|         } | ||||
|     }; | ||||
|   | ||||
| @@ -68,7 +68,7 @@ pub async fn add_totp_factor_route(_critical: CriticalRoute, user: CurrentUser) | ||||
|     let qr_code = match qr_code { | ||||
|         Ok(q) => q, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to generate QrCode! {e:?}"); | ||||
|             log::error!("Failed to generate QrCode! {:?}", e); | ||||
|             return HttpResponse::InternalServerError().body("Failed to generate QrCode!"); | ||||
|         } | ||||
|     }; | ||||
| @@ -95,7 +95,7 @@ pub async fn add_webauthn_factor_route( | ||||
|     let registration_request = match manager.start_register(&user) { | ||||
|         Ok(r) => r, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to request new key! {e:?}"); | ||||
|             log::error!("Failed to request new key! {:?}", e); | ||||
|             return HttpResponse::InternalServerError() | ||||
|                 .body("Failed to generate request for registration!"); | ||||
|         } | ||||
| @@ -104,7 +104,7 @@ pub async fn add_webauthn_factor_route( | ||||
|     let challenge_json = match serde_json::to_string(®istration_request.creation_challenge) { | ||||
|         Ok(r) => r, | ||||
|         Err(e) => { | ||||
|             log::error!("Failed to serialize challenge! {e:?}"); | ||||
|             log::error!("Failed to serialize challenge! {:?}", e); | ||||
|             return HttpResponse::InternalServerError().body("Failed to serialize challenge!"); | ||||
|         } | ||||
|     }; | ||||
|   | ||||
| @@ -156,7 +156,8 @@ impl Action<'_> { | ||||
|                     .to_string() | ||||
|             } | ||||
|             Action::ProviderFailedGetToken { state, code } => format!( | ||||
|                 "could not complete login from provider because the id_token could not be retrieved! (state={state:?} code = {code})" | ||||
|                 "could not complete login from provider because the id_token could not be retrieved! (state={:?} code = {code})", | ||||
|                 state | ||||
|             ), | ||||
|             Action::ProviderFailedGetUserInfo { provider } => format!( | ||||
|                 "could not get user information from userinfo endpoint of provider {}!", | ||||
|   | ||||
| @@ -18,14 +18,6 @@ pub struct AppConfig { | ||||
|     #[clap(short, long, env)] | ||||
|     pub storage_path: String, | ||||
|  | ||||
|     /// Overwrite clients list file path, if the file is not to be found in storage path | ||||
|     #[clap(long, env)] | ||||
|     pub clients_list_file_path: Option<String>, | ||||
|  | ||||
|     /// Overwrite providers list file path, if the file is not to be found in storage path | ||||
|     #[clap(long, env)] | ||||
|     pub providers_list_file_path: Option<String>, | ||||
|  | ||||
|     /// App token token | ||||
|     #[clap(short, long, env, default_value = "")] | ||||
|     pub token_key: String, | ||||
| @@ -40,7 +32,7 @@ pub struct AppConfig { | ||||
|  | ||||
|     /// IP location service API | ||||
|     /// | ||||
|     /// Operating instance of IP location service : https://gitlab.com/pierre42100/iplocationserver | ||||
|     /// Up instance of IP location service : https://gitlab.com/pierre42100/iplocationserver | ||||
|     /// | ||||
|     /// Example: "https://api.geoip.rs" | ||||
|     #[arg(long, short, env)] | ||||
| @@ -79,17 +71,11 @@ impl AppConfig { | ||||
|     } | ||||
|  | ||||
|     pub fn clients_file(&self) -> PathBuf { | ||||
|         match &self.clients_list_file_path { | ||||
|             None => self.storage_path().join(CLIENTS_LIST_FILE), | ||||
|             Some(p) => Path::new(p).to_path_buf(), | ||||
|         } | ||||
|         self.storage_path().join(CLIENTS_LIST_FILE) | ||||
|     } | ||||
|  | ||||
|     pub fn providers_file(&self) -> PathBuf { | ||||
|         match &self.providers_list_file_path { | ||||
|             None => self.storage_path().join(PROVIDERS_LIST_FILE), | ||||
|             Some(p) => Path::new(p).to_path_buf(), | ||||
|         } | ||||
|         self.storage_path().join(PROVIDERS_LIST_FILE) | ||||
|     } | ||||
|  | ||||
|     pub fn full_url(&self, uri: &str) -> String { | ||||
|   | ||||
| @@ -125,7 +125,7 @@ impl Client { | ||||
|  | ||||
| pub type ClientManager = EntityManager<Client>; | ||||
|  | ||||
| impl ClientManager { | ||||
| impl EntityManager<Client> { | ||||
|     pub fn find_by_id(&self, u: &ClientID) -> Option<Client> { | ||||
|         for entry in self.iter() { | ||||
|             if entry.id.eq(u) { | ||||
|   | ||||
| @@ -22,7 +22,7 @@ impl CodeChallenge { | ||||
|                 encoded.eq(&self.code_challenge) | ||||
|             } | ||||
|             s => { | ||||
|                 log::error!("Unknown code challenge method: {s}"); | ||||
|                 log::error!("Unknown code challenge method: {}", s); | ||||
|                 false | ||||
|             } | ||||
|         } | ||||
| @@ -40,8 +40,8 @@ mod test { | ||||
|             code_challenge: "text1".to_string(), | ||||
|         }; | ||||
|  | ||||
|         assert!(chal.verify_code("text1")); | ||||
|         assert!(!chal.verify_code("text2")); | ||||
|         assert_eq!(true, chal.verify_code("text1")); | ||||
|         assert_eq!(false, chal.verify_code("text2")); | ||||
|     } | ||||
|  | ||||
|     #[test] | ||||
| @@ -51,8 +51,8 @@ mod test { | ||||
|             code_challenge: "uSOvC48D8TMh6RgW-36XppMlMgys-6KAE_wEIev9W2g".to_string(), | ||||
|         }; | ||||
|  | ||||
|         assert!(chal.verify_code("HIwht3lCHfnsruA+7Sq8NP2mPj5cBZe0Ewf23eK9UQhK4TdCIt3SK7Fr/giCdnfjxYQILOPG2D562emggAa2lA==")); | ||||
|         assert!(!chal.verify_code("text1")); | ||||
|         assert_eq!(true, chal.verify_code("HIwht3lCHfnsruA+7Sq8NP2mPj5cBZe0Ewf23eK9UQhK4TdCIt3SK7Fr/giCdnfjxYQILOPG2D562emggAa2lA==")); | ||||
|         assert_eq!(false, chal.verify_code("text1")); | ||||
|     } | ||||
|  | ||||
|     #[test] | ||||
| @@ -62,7 +62,10 @@ mod test { | ||||
|             code_challenge: "E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM".to_string(), | ||||
|         }; | ||||
|  | ||||
|         assert!(chal.verify_code("dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk")); | ||||
|         assert!(!chal.verify_code("text1")); | ||||
|         assert_eq!( | ||||
|             true, | ||||
|             chal.verify_code("dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk") | ||||
|         ); | ||||
|         assert_eq!(false, chal.verify_code("text1")); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -46,7 +46,7 @@ impl SessionIdentity<'_> { | ||||
|             .map(|f| match f { | ||||
|                 Ok(d) => Some(d), | ||||
|                 Err(e) => { | ||||
|                     log::warn!("Failed to deserialize session data! {e:?}"); | ||||
|                     log::warn!("Failed to deserialize session data! {:?}", e); | ||||
|                     None | ||||
|                 } | ||||
|             }) | ||||
| @@ -65,7 +65,7 @@ impl SessionIdentity<'_> { | ||||
|  | ||||
|         log::debug!("Will set user session data."); | ||||
|         if let Err(e) = Identity::login(&req.extensions(), s) { | ||||
|             log::error!("Failed to set session data! {e}"); | ||||
|             log::error!("Failed to set session data! {}", e); | ||||
|         } | ||||
|         log::debug!("Did set user session data."); | ||||
|     } | ||||
|   | ||||
| @@ -18,7 +18,7 @@ impl EntityManager<User> { | ||||
|         }; | ||||
|  | ||||
|         if let Err(e) = self.replace_entries(|u| u.uid.eq(id), &update(user)) { | ||||
|             log::error!("Failed to update user information! {e:?}"); | ||||
|             log::error!("Failed to update user information! {:?}", e); | ||||
|             return Err(e); | ||||
|         } | ||||
|  | ||||
| @@ -34,7 +34,7 @@ fn verify_password<P: AsRef<[u8]>>(pwd: P, hash: &str) -> bool { | ||||
|     match bcrypt::verify(pwd, hash) { | ||||
|         Ok(r) => r, | ||||
|         Err(e) => { | ||||
|             log::warn!("Failed to verify password! {e:?}"); | ||||
|             log::warn!("Failed to verify password! {:?}", e); | ||||
|             false | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -108,11 +108,15 @@ impl WebAuthManager { | ||||
|     ) -> Res<WebauthnPubKey> { | ||||
|         let state: RegisterKeyOpaqueData = self.crypto_wrapper.decrypt(opaque_state)?; | ||||
|         if state.user_id != user.uid { | ||||
|             return Err(Box::new(std::io::Error::other("Invalid user for pubkey!"))); | ||||
|             return Err(Box::new(std::io::Error::other( | ||||
|                 "Invalid user for pubkey!", | ||||
|             ))); | ||||
|         } | ||||
|  | ||||
|         if state.expire < time() { | ||||
|             return Err(Box::new(std::io::Error::other("Challenge has expired!"))); | ||||
|             return Err(Box::new(std::io::Error::other( | ||||
|                 "Challenge has expired!", | ||||
|             ))); | ||||
|         } | ||||
|  | ||||
|         let res = self.core.finish_passkey_registration( | ||||
| @@ -150,11 +154,15 @@ impl WebAuthManager { | ||||
|     ) -> Res { | ||||
|         let state: AuthStateOpaqueData = self.crypto_wrapper.decrypt(opaque_state)?; | ||||
|         if &state.user_id != user_id { | ||||
|             return Err(Box::new(std::io::Error::other("Invalid user for pubkey!"))); | ||||
|             return Err(Box::new(std::io::Error::other( | ||||
|                 "Invalid user for pubkey!", | ||||
|             ))); | ||||
|         } | ||||
|  | ||||
|         if state.expire < time() { | ||||
|             return Err(Box::new(std::io::Error::other("Challenge has expired!"))); | ||||
|             return Err(Box::new(std::io::Error::other( | ||||
|                 "Challenge has expired!", | ||||
|             ))); | ||||
|         } | ||||
|  | ||||
|         self.core.finish_passkey_authentication( | ||||
|   | ||||
| @@ -3,7 +3,7 @@ use std::sync::Arc; | ||||
|  | ||||
| use actix::Actor; | ||||
| use actix_identity::IdentityMiddleware; | ||||
| use actix_identity::config::LogoutBehavior; | ||||
| use actix_identity::config::LogoutBehaviour; | ||||
| use actix_remote_ip::RemoteIPConfig; | ||||
| use actix_session::SessionMiddleware; | ||||
| use actix_session::storage::CookieSessionStore; | ||||
| @@ -51,7 +51,7 @@ async fn main() -> std::io::Result<()> { | ||||
|  | ||||
|     // Create initial user if required | ||||
|     if users.is_empty() { | ||||
|         log::info!("Create default {DEFAULT_ADMIN_USERNAME} user"); | ||||
|         log::info!("Create default {} user", DEFAULT_ADMIN_USERNAME); | ||||
|         let default_admin = User { | ||||
|             username: DEFAULT_ADMIN_USERNAME.to_string(), | ||||
|             authorized_clients: None, | ||||
| @@ -100,7 +100,7 @@ async fn main() -> std::io::Result<()> { | ||||
|         .build(); | ||||
|  | ||||
|         let identity_middleware = IdentityMiddleware::builder() | ||||
|             .logout_behavior(LogoutBehavior::PurgeSession) | ||||
|             .logout_behaviour(LogoutBehaviour::PurgeSession) | ||||
|             .visit_deadline(Some(Duration::from_secs(MAX_INACTIVITY_DURATION))) | ||||
|             .login_deadline(Some(Duration::from_secs(MAX_SESSION_DURATION))) | ||||
|             .build(); | ||||
|   | ||||
| @@ -89,21 +89,25 @@ where | ||||
|         Box::pin(async move { | ||||
|             // Check if POST request comes from another website (block invalid origins) | ||||
|             let origin = req.headers().get(header::ORIGIN); | ||||
|             if req.method() == Method::POST | ||||
|                 && req.path() != TOKEN_URI | ||||
|                 && req.path() != USERINFO_URI | ||||
|                 && let Some(o) = origin | ||||
|                 && !o | ||||
|                     .to_str() | ||||
|                     .unwrap_or("bad") | ||||
|                     .eq(&AppConfig::get().website_origin) | ||||
|             if req.method() == Method::POST && req.path() != TOKEN_URI && req.path() != USERINFO_URI | ||||
|             { | ||||
|                 log::warn!("Blocked POST request from invalid origin! Origin given {o:?}"); | ||||
|                 return Ok(req.into_response( | ||||
|                     HttpResponse::Unauthorized() | ||||
|                         .body("POST request from invalid origin!") | ||||
|                         .map_into_right_body(), | ||||
|                 )); | ||||
|                 if let Some(o) = origin { | ||||
|                     if !o | ||||
|                         .to_str() | ||||
|                         .unwrap_or("bad") | ||||
|                         .eq(&AppConfig::get().website_origin) | ||||
|                     { | ||||
|                         log::warn!( | ||||
|                             "Blocked POST request from invalid origin! Origin given {:?}", | ||||
|                             o | ||||
|                         ); | ||||
|                         return Ok(req.into_response( | ||||
|                             HttpResponse::Unauthorized() | ||||
|                                 .body("POST request from invalid origin!") | ||||
|                                 .map_into_right_body(), | ||||
|                         )); | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             if req.path().starts_with("/.git") { | ||||
| @@ -129,8 +133,8 @@ where | ||||
|                 _ => ConnStatus::SignedOut, | ||||
|             }; | ||||
|  | ||||
|             log::trace!("Connection data: {session_data:#?}"); | ||||
|             log::debug!("Connection status: {session:?}"); | ||||
|             log::trace!("Connection data: {:#?}", session_data); | ||||
|             log::debug!("Connection status: {:?}", session); | ||||
|  | ||||
|             // Redirect user to login page | ||||
|             if !session.is_auth() | ||||
|   | ||||
| @@ -47,7 +47,7 @@ mod test { | ||||
|         unsafe { | ||||
|             env::set_var(VAR_ONE, "good"); | ||||
|         } | ||||
|         let src = format!("This is ${{{VAR_ONE}}}"); | ||||
|         let src = format!("This is ${{{}}}", VAR_ONE); | ||||
|         assert_eq!("This is good", apply_env_vars(&src)); | ||||
|     } | ||||
|  | ||||
| @@ -55,7 +55,7 @@ mod test { | ||||
|  | ||||
|     #[test] | ||||
|     fn test_invalid_var_syntax() { | ||||
|         let src = format!("This is ${{{VAR_INVALID}}}"); | ||||
|         let src = format!("This is ${{{}}}", VAR_INVALID); | ||||
|         assert_eq!(src, apply_env_vars(&src)); | ||||
|     } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user