fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

Merge branch 'master' into fix/ldap

Browse Source
This commit is contained in:
Steffen Jost 2021-12-13 17:44:15 +01:00
commit 49227a5714
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/schools.model
View File

@ -6,7 +6,7 @@ School json
examMinimumRegisterBeforeStart NominalDiffTime Maybe examMinimumRegisterBeforeStart NominalDiffTime Maybe
examMinimumRegisterDuration NominalDiffTime Maybe examMinimumRegisterDuration NominalDiffTime Maybe
examRequireModeForRegistration Bool default=false examRequireModeForRegistration Bool default=false
examDiscouragedModes ExamModeDNF default='{"dnf-terms": []}' examDiscouragedModes ExamModeDNF default='{"dnf-terms":[]}'
examCloseMode ExamCloseMode default='separate' examCloseMode ExamCloseMode default='separate'
sheetAuthorshipStatementMode SchoolAuthorshipStatementMode default='optional' sheetAuthorshipStatementMode SchoolAuthorshipStatementMode default='optional'
sheetAuthorshipStatementDefinition AuthorshipStatementDefinitionId Maybe sheetAuthorshipStatementDefinition AuthorshipStatementDefinitionId Maybe

2
nix/docker/default.nix
View File

@ -26,7 +26,7 @@ let
# pandoc # just for manual testing within the pod, remove for production, since we use the library instead! # pandoc # just for manual testing within the pod, remove for production, since we use the library instead!
curl wget netcat # just for manual testing within the pod, remove for production! curl wget netcat # just for manual testing within the pod, remove for production!
openldap # just for manual testing within the pod, remove for production! openldap # just for manual testing within the pod, remove for production!
build-essentials iana-etc
] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ]; ] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ];
runAsRoot = '' runAsRoot = ''

2
routes
View File

@ -39,7 +39,7 @@
/static StaticR EmbeddedStatic appStatic !free /static StaticR EmbeddedStatic appStatic !free
/auth AuthR Auth getAuth !free /auth AuthR Auth getAuth !free
/metrics MetricsR GET /metrics MetricsR GET !free -- verify if this can be free
/err ErrorR GET !free /err ErrorR GET !free

3
src/Foundation/Yesod/Middleware.hs
View File

@ -137,6 +137,7 @@ yesodMiddleware = cacheControlMiddleware . storeBearerMiddleware . csrfMiddlewar
case route of case route of
MetricsR -> mzero MetricsR -> mzero
HealthR -> mzero HealthR -> mzero
StatusR -> mzero
InstanceR -> mzero InstanceR -> mzero
AdminCrontabR -> mzero AdminCrontabR -> mzero
_other -> return () _other -> return ()
@ -147,7 +148,7 @@ yesodMiddleware = cacheControlMiddleware . storeBearerMiddleware . csrfMiddlewar
approotHost <- hoistMaybe $ approotScopeHost rApproot app approotHost <- hoistMaybe $ approotScopeHost rApproot app
let doRedirect = do let doRedirect = do
url <- approotRender rApproot route url <- approotRender rApproot route
$logDebugS "normalizeApprootMiddleware" url $logDebugS "normalizeApprootMiddleware redirect" url
redirect url redirect url
if | approotHost /= reqHost if | approotHost /= reqHost
, rApproot /= ApprootUserGenerated , rApproot /= ApprootUserGenerated