fixes to access control

Author: clovis

python/philologic/runtime/access_control.py

@@ -134,7 +134,15 @@ def login_access(environ, request, config, headers):
                     headers.append(("Set-Cookie", f"hash={h}"))
                     headers.append(("Set-Cookie", f"timestamp={ts}"))
         else:
-            access = False
+            # WORKAROUND because cookie not being sent on access_request.py request
+            token = check_access(environ, config)
+            if token:
+                h, ts = token
+                headers.append(("Set-Cookie", f"hash={h}"))
+                headers.append(("Set-Cookie", f"timestamp={ts}"))
+                access = True
+            else:
+                access = False
     return access, headers
 
 

www/app/src/App.vue

@@ -125,16 +125,24 @@ export default {
             const html = document.documentElement;
             html.setAttribute("lang", "sv");
             this.accessAuthorized = this.$philoConfig.access_control ? false : true;
+            console.log(document.cookie);
             if (this.$philoConfig.access_control) {
-                this.$http.get(`${this.$dbUrl}/scripts/access_request.py`).then((response) => {
-                    this.accessAuthorized = response.data.access;
-                    if (this.accessAuthorized) {
-                        this.setupApp();
-                    } else {
-                        this.clientIp = response.data.incoming_address;
-                        this.domainName = response.data.domain_name;
-                    }
-                });
+                this.$http
+                    .get(`${this.$dbUrl}/scripts/access_request.py`, {
+                        headers: {
+                            "Access-Control-Allow-Origin": "*",
+                        },
+                    })
+                    .then((response) => {
+                        this.accessAuthorized = response.data.access;
+                        if (this.accessAuthorized) {
+                            this.setupApp();
+                        } else {
+                            this.clientIp = response.data.incoming_address;
+                            this.domainName = response.data.domain_name;
+                        }
+                        console.log(document.cookie);
+                    });
             } else {
                 this.setupApp();
             }

www/app/src/main.js

@@ -10,9 +10,10 @@ import "bootstrap"
 import appConfig from "../appConfig.json"
 import i18n from './i18n'
 
+axios.defaults.withCredentials = true;
+
 axios
-    .get(`${appConfig.dbUrl}/scripts/get_web_config.py`, {
-    })
+    .get(`${appConfig.dbUrl}/scripts/get_web_config.py`, {})
     .then((response) => {
         const app = createApp(App).use(i18n)
         app.config.globalProperties.$philoConfig = response.data
@@ -26,19 +27,28 @@ axios
         app.use(store)
         app.mixin({
             methods: {
-                paramsFilter, paramsToRoute, paramsToUrlString, copyObject, saveToLocalStorage, mergeResults, sortResults, deepEqual, dictionaryLookup, debug
+                paramsFilter,
+                paramsToRoute,
+                paramsToUrlString,
+                copyObject,
+                saveToLocalStorage,
+                mergeResults,
+                sortResults,
+                deepEqual,
+                dictionaryLookup,
+                debug
             }
         })
         app.directive('scroll', {
-            mounted: function (el, binding) {
-                el.scrollHandler = function (evt) {
+            mounted: function(el, binding) {
+                el.scrollHandler = function(evt) {
                     if (binding.value(evt, el)) {
                         window.removeEventListener('scroll', el.scrollHandler)
                     }
                 }
                 window.addEventListener('scroll', el.scrollHandler)
             },
-            unmounted: function (el) {
+            unmounted: function(el) {
                 window.removeEventListener("scroll", el.scrollHandler)
             }
         })