From 1ac35e0bf816ccdccaf984ee5fe28b329c9cb258 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 3 Dec 2021 00:20:27 +0100 Subject: [PATCH 1/5] fix(docker): remove missing docker dependency --- nix/docker/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nix/docker/default.nix b/nix/docker/default.nix index 7fbcd696e..344691921 100644 --- a/nix/docker/default.nix +++ b/nix/docker/default.nix @@ -26,7 +26,6 @@ let # 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! openldap # just for manual testing within the pod, remove for production! - build-essentials ] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ]; runAsRoot = '' From 113684664b83fed0403e1ad108d0bd8c34201fcc Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 3 Dec 2021 11:00:11 +0100 Subject: [PATCH 2/5] chore: add iana-etc to address https://github.com/snoyberg/http-client/issues/292 --- nix/docker/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/docker/default.nix b/nix/docker/default.nix index 344691921..ddba4fb58 100644 --- a/nix/docker/default.nix +++ b/nix/docker/default.nix @@ -26,6 +26,7 @@ let # 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! openldap # just for manual testing within the pod, remove for production! + iana-etc ] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ]; runAsRoot = '' From 074a33dc51bd7e9ed72434223ceb06d70f1044c5 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 8 Dec 2021 16:34:55 +0100 Subject: [PATCH 3/5] fix(status): route status exempt from approot normalisation, might not fix the issue yet --- src/Foundation/Yesod/Middleware.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Foundation/Yesod/Middleware.hs b/src/Foundation/Yesod/Middleware.hs index f0c078ec7..c39fb9256 100644 --- a/src/Foundation/Yesod/Middleware.hs +++ b/src/Foundation/Yesod/Middleware.hs @@ -137,6 +137,7 @@ yesodMiddleware = cacheControlMiddleware . storeBearerMiddleware . csrfMiddlewar case route of MetricsR -> mzero HealthR -> mzero + StatusR -> mzero InstanceR -> mzero AdminCrontabR -> mzero _other -> return () @@ -147,7 +148,7 @@ yesodMiddleware = cacheControlMiddleware . storeBearerMiddleware . csrfMiddlewar approotHost <- hoistMaybe $ approotScopeHost rApproot app let doRedirect = do url <- approotRender rApproot route - $logDebugS "normalizeApprootMiddleware" url + $logDebugS "normalizeApprootMiddleware redirect" url redirect url if | approotHost /= reqHost , rApproot /= ApprootUserGenerated From 085c841035b3f808ce6d8ae3f6e0e9e6452028df Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 8 Dec 2021 17:11:12 +0100 Subject: [PATCH 4/5] fix(metrics): allow free access to metrics during development only --- routes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes b/routes index 40f7529bc..76e11b5f0 100644 --- a/routes +++ b/routes @@ -39,7 +39,7 @@ /static StaticR EmbeddedStatic appStatic !free /auth AuthR Auth getAuth !free -/metrics MetricsR GET +/metrics MetricsR GET !free -- verify if this can be free /err ErrorR GET !free From 9ee7ec8d7ab74832d10b6384490b9d20263f49b9 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 13 Dec 2021 17:43:50 +0100 Subject: [PATCH 5/5] fix(build): schools.model examDiscouragedModes default contained whitespace, which is not allowed --- models/schools.model | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/schools.model b/models/schools.model index 9ecc4d935..7e959cff6 100644 --- a/models/schools.model +++ b/models/schools.model @@ -6,7 +6,7 @@ School json examMinimumRegisterBeforeStart NominalDiffTime Maybe examMinimumRegisterDuration NominalDiffTime Maybe examRequireModeForRegistration Bool default=false - examDiscouragedModes ExamModeDNF default='{"dnf-terms": []}' + examDiscouragedModes ExamModeDNF default='{"dnf-terms":[]}' examCloseMode ExamCloseMode default='separate' sheetAuthorshipStatementMode SchoolAuthorshipStatementMode default='optional' sheetAuthorshipStatementDefinition AuthorshipStatementDefinitionId Maybe