merge main hotfix

Dockerfile

@@ -21,6 +21,7 @@ COPY --from=node-base / /
 
 COPY ./package.json /app/
 WORKDIR /app/
+RUN npm install --global npm@11.19.1
 RUN npm install .
 
 COPY . /app/

compass/cache.py

@@ -13,12 +13,17 @@
 
 class CompassRestclientCache(RestclientPymemcacheClient):
     def get_cache_expiration_time(self, service, url, status=None):
+        if status and status != 200:
+            return ONE_MINUTE * 7
+
         if 'pws' == service:
             if re.match(r'^/idcard/v1/photo', url):
                 return ONE_DAY * 5
             return ONE_HOUR * 4
         elif 'sws' == service:
-            return ONE_DAY
+            if re.match(r'^/student/v5/term/', url):
+                return ONE_DAY
+            return ONE_MINUTE * 15
         elif 'gws' == service:
             return ONE_MINUTE * 15
 

compass/tests/test_cache.py

@@ -21,8 +21,21 @@ def test_cache_expiration_time(self):
         pws_time = self.cache.get_cache_expiration_time('pws', '/person/')
         self.assertEqual(pws_time, 14400)
 
-        sws_time = self.cache.get_cache_expiration_time('sws', '/student/')
-        self.assertEqual(sws_time, 86400)
+        sws_term_time = self.cache.get_cache_expiration_time(
+            'sws', '/student/v5/term/current.json')
+        self.assertEqual(sws_term_time, 86400)
+
+        sws_registration_time = self.cache.get_cache_expiration_time(
+            'sws', '/student/v5/registration.json')
+        self.assertEqual(sws_registration_time, 900)
+
+        sws_not_found_time = self.cache.get_cache_expiration_time(
+            'sws', '/student/v5/registration.json', status=404)
+        self.assertEqual(sws_not_found_time, 420)
+
+        sws_unavailable_time = self.cache.get_cache_expiration_time(
+            'sws', '/student/v5/registration.json', status=503)
+        self.assertEqual(sws_unavailable_time, 420)
 
         gws_time = self.cache.get_cache_expiration_time('gws', '/group/')
         self.assertEqual(gws_time, 900)

docker/prod-values.yml

@@ -69,9 +69,14 @@ gcsCredentials:
 
 certs:
   mounted: true
-  certPath: /certs/compass.uw.edu-ic.cert
-  keyPath: /certs/compass.uw.edu-ic.key
-  secretName: compass.uw.edu-ic-certs
+  certPath: /certs/compass.uw.edu-uwca.cert
+  keyPath: /certs/compass.uw.edu-uwca.key
+  secretName: compass.uw.edu-uwca-certs
+
+mountedSecrets:
+  enabled: true
+  mountPath: /ssl
+  secretName: compass.uw.edu-openssl-conf
 
 cronjob:
   enabled: true
@@ -85,6 +90,9 @@ environmentVariables:
   - name: ENV
     value: prod
 
+  - name: OPENSSL_CONF
+    value: /ssl/openssl.cnf
+
   - name: SWS_ENV
     value: PROD
   - name: SWS_TIMEOUT
@@ -155,18 +163,23 @@ externalSecrets:
       data:
         - name: credentials.json
           property: credentials.json
-    - name: compass.uw.edu-ic-certs
-      externalKey: compass/prod/ic-certs
+    - name: compass.uw.edu-uwca-certs
+      externalKey: compass/prod/uwca-certs
       data:
-        - name: compass.uw.edu-ic.cert
-          property: compass.uw.edu-ic.cert
-        - name: compass.uw.edu-ic.key
-          property: compass.uw.edu-ic.key
+        - name: compass.uw.edu-uwca.cert
+          property: compass.uw.edu-uwca.cert
+        - name: compass.uw.edu-uwca.key
+          property: compass.uw.edu-uwca.key
     - name: compass.uw.edu-uw-idp-cert
       externalKey: idp-cert
       data:
         - name: uw-idp-cert
           property: cert
+    - name: compass.uw.edu-openssl-conf
+      externalKey: openssl-conf
+      data:
+        - name: openssl.cnf
+          property: openssl.cnf
 
 environmentVariablesSecrets:
   djangoSecret:
@@ -187,8 +200,8 @@ environmentVariablesSecrets:
     secretKey: google-analytics-key
   samlSPCert:
     name: SP_CERT
-    secretName: compass.uw.edu-ic-certs
-    secretKey: compass.uw.edu-ic.cert
+    secretName: compass.uw.edu-uwca-certs
+    secretKey: compass.uw.edu-uwca.cert
   samlIDPCert:
     name: IDP_CERT
     secretName: compass.uw.edu-uw-idp-cert

docker/test-values.yml

@@ -68,14 +68,22 @@ gcsCredentials:
 
 certs:
   mounted: true
-  certPath: /certs/compass.uw.edu-ic.cert
-  keyPath: /certs/compass.uw.edu-ic.key
-  secretName: test.compass.uw.edu-ic-certs
+  certPath: /certs/compass.uw.edu-uwca.cert
+  keyPath: /certs/compass.uw.edu-uwca.key
+  secretName: test.compass.uw.edu-uwca-certs
+
+mountedSecrets:
+  enabled: true
+  mountPath: /ssl
+  secretName: test.compass.uw.edu-openssl-conf
 
 environmentVariables:
   - name: ENV
     value: test
 
+  - name: OPENSSL_CONF
+    value: /ssl/openssl.cnf
+
   - name: SWS_ENV
     value: PROD
   - name: SWS_TIMEOUT
@@ -142,13 +150,13 @@ externalSecrets:
       data:
         - name: credentials.json
           property: credentials.json
-    - name: test.compass.uw.edu-ic-certs
-      externalKey: compass/prod/ic-certs
+    - name: test.compass.uw.edu-uwca-certs
+      externalKey: compass/prod/uwca-certs
       data:
-        - name: compass.uw.edu-ic.cert
-          property: compass.uw.edu-ic.cert
-        - name: compass.uw.edu-ic.key
-          property: compass.uw.edu-ic.key
+        - name: compass.uw.edu-uwca.cert
+          property: compass.uw.edu-uwca.cert
+        - name: compass.uw.edu-uwca.key
+          property: compass.uw.edu-uwca.key
     - name: test.compass.uw.edu-sp-cert
       externalKey: compass/test/ic-certs
       data:
@@ -159,6 +167,11 @@ externalSecrets:
       data:
         - name: uw-idp-cert
           property: cert
+    - name: test.compass.uw.edu-openssl-conf
+      externalKey: openssl-conf
+      data:
+        - name: openssl.cnf
+          property: openssl.cnf
 
 environmentVariablesSecrets:
   djangoSecret: