29 Commits

Author SHA1 Message Date
06c5e5a9d1 Merge branch 'staging' into simple-nx-auth
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-04-18 17:10:10 +02:00
2458b0a100 Merge pull request 'signal-breaking-mobile' (#921) from signal-breaking-mobile into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 16m3s
CI/CD Pipeline / deploy-staging (push) Successful in 7m15s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #921
2025-04-17 22:01:40 +02:00
7e0b30f058 Merge pull request 'better description of the button' (#919) from send-fee-reminder into staging
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #919
2025-04-17 21:53:56 +02:00
8340e8b33f Merge pull request 'allow others to send fee reminder thus reducing my bus factor' (#915) from send-fee-reminder into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 16m53s
CI/CD Pipeline / deploy-staging (push) Successful in 8m9s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #915
2025-04-17 20:44:45 +02:00
3b25143a08 Merge pull request '400 instead of 303' (#907) from nx-auth into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m31s
CI/CD Pipeline / deploy-staging (push) Successful in 7m16s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #907
2025-04-16 11:32:07 +02:00
4ce9a573fe 400 instead of 303
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-04-16 11:31:46 +02:00
78aafe4d41 Merge pull request 'nx-auth' (#906) from nx-auth into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m52s
CI/CD Pipeline / deploy-staging (push) Successful in 7m32s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #906
2025-04-16 10:57:35 +02:00
dc2ee38aa0 no funny business w/ get params
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-04-16 10:56:57 +02:00
2b79df8e42 no funny business w/ get params
Some checks failed
CI/CD Pipeline / test (push) Failing after 2m6s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-04-16 10:46:19 +02:00
43c0b9ffc1 Merge pull request 'nx-auth' (#905) from nx-auth into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m50s
CI/CD Pipeline / deploy-staging (push) Successful in 7m30s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #905
2025-04-16 10:19:13 +02:00
588520914c add nextcloud auth route
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-04-16 10:18:27 +02:00
0c425f7a8e Merge pull request 'fix tests' (#902) from fix-cal-uid into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 14m31s
CI/CD Pipeline / deploy-staging (push) Successful in 8m33s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #902
2025-04-15 23:18:26 +02:00
21b33566bc Merge pull request 'make default duration 3 hrs (to have a larger block in the cal)' (#900) from fix-cal-uid into staging
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #900
2025-04-15 23:13:13 +02:00
ca3de1123b Merge pull request 'fix ci' (#898) from fix-cal-uid into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 14m14s
CI/CD Pipeline / deploy-staging (push) Successful in 7m4s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #898
2025-04-15 22:12:09 +02:00
1c628f40ed Merge pull request 'also show cox_helps_at_event in cal' (#897) from fix-cal-uid into staging
Some checks failed
CI/CD Pipeline / test (push) Failing after 12m54s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #897
2025-04-15 20:53:40 +02:00
2f4874321f Merge pull request 'have unique uid's, fixes error in some clients (e.g. sogo)' (#895) from fix-cal-uid into staging
Some checks failed
CI/CD Pipeline / test (push) Failing after 12m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #895
2025-04-15 20:33:46 +02:00
35dffdd8f0 Merge pull request 'upd' (#892) from upd into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 25m9s
CI/CD Pipeline / deploy-staging (push) Successful in 24m13s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #892
2025-04-15 14:20:20 +02:00
b419004949 Merge pull request 'fix-kiosk-error' (#885) from fix-kiosk-error into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 16m9s
CI/CD Pipeline / deploy-staging (push) Successful in 6m58s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #885
2025-03-26 20:58:10 +01:00
94938fb4ea Merge pull request 'update deps' (#883) from upd into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m47s
CI/CD Pipeline / deploy-staging (push) Successful in 24m37s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #883
2025-03-26 14:52:02 +01:00
2368f03761 Merge pull request 'update id's' (#881) from add-unit-test into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m14s
CI/CD Pipeline / deploy-staging (push) Successful in 6m47s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #881
2025-03-09 19:21:35 +01:00
a7d33548d4 Merge pull request 'add-unit-test' (#879) from add-unit-test into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #879
2025-03-09 19:18:24 +01:00
0f345862ee Merge pull request 'correct-name-in-notification' (#878) from correct-name-in-notification into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 14m16s
CI/CD Pipeline / deploy-staging (push) Successful in 7m15s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #878
2025-03-09 13:34:36 +01:00
856e3b2cff Merge pull request 'update deps' (#872) from update-deps into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m6s
CI/CD Pipeline / deploy-staging (push) Successful in 21m9s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #872
2025-03-06 10:24:35 +01:00
9b9cf98473 Merge pull request 'remove-philipp-mentioning' (#870) from remove-philipp-mentioning into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 16m10s
CI/CD Pipeline / deploy-staging (push) Successful in 8m54s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #870
2025-02-17 22:58:45 +01:00
ae61564ad4 Merge pull request 'update-deps' (#868) from update-deps into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m22s
CI/CD Pipeline / deploy-staging (push) Successful in 19m33s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #868
2025-02-13 10:06:50 +01:00
a2a39103e0 Merge pull request 'upd' (#865) from upd into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 14m59s
CI/CD Pipeline / deploy-staging (push) Successful in 6m51s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #865
2025-02-11 21:54:14 +01:00
d82bd3ebeb Merge pull request 'fix ci' (#862) from allow-secretary-to-edit-boats into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 14m25s
CI/CD Pipeline / deploy-staging (push) Successful in 7m24s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #862
2025-02-11 09:37:20 +01:00
32800b1897 Merge pull request 'allow vorstand to edit boats' (#860) from allow-secretary-to-edit-boats into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #860
2025-02-11 09:23:28 +01:00
cfd8b12556 Merge pull request 'main' (#859) from main into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m59s
CI/CD Pipeline / deploy-staging (push) Successful in 20m54s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #859
2025-02-10 18:49:20 +01:00
3 changed files with 5 additions and 2 deletions

1
Cargo.lock generated
View File

@@ -2544,6 +2544,7 @@ name = "rot"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"argon2", "argon2",
"base64",
"chrono", "chrono",
"chrono-tz 0.10.3", "chrono-tz 0.10.3",
"csv", "csv",

View File

@@ -29,6 +29,7 @@ job_scheduler_ng = "2.0"
ureq = { version = "3.0", features = ["json"] } ureq = { version = "3.0", features = ["json"] }
regex = "1.10" regex = "1.10"
urlencoding = "2.1" urlencoding = "2.1"
base64 = "0.22"
[target.'cfg(not(windows))'.dependencies] [target.'cfg(not(windows))'.dependencies]
openssl = { version = "0.10", features = [ "vendored" ] } openssl = { version = "0.10", features = [ "vendored" ] }

View File

@@ -7,9 +7,9 @@ use rocket::{
form::Form, form::Form,
fs::FileServer, fs::FileServer,
get, get,
http::Cookie, http::{Cookie, Status},
post, post,
request::FlashMessage, request::{FlashMessage, FromRequest, Outcome},
response::{Flash, Redirect}, response::{Flash, Redirect},
routes, routes,
time::{Duration, OffsetDateTime}, time::{Duration, OffsetDateTime},
@@ -30,6 +30,7 @@ use crate::{
}, },
SCHECKBUCH, SCHECKBUCH,
}; };
use base64::alphabet::STANDARD;
pub(crate) mod admin; pub(crate) mod admin;
mod auth; mod auth;