feat: cookie authentication

.github/workflows/main.yml

@@ -150,3 +150,9 @@ jobs:
           pnpm install
           pnpm run install-playwright
           pnpm run test
+      - name: Upload test artifacts
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: test-results
+          path: ./server/e2e_tests/test-results/

CHANGELOG.md

@@ -9,6 +9,7 @@ Changes to JS assets are not included here, but in [`atomic-data-browser`'s CHAN
 - Add parent parameter to search endpoint which scopes a search to only the descendants of the given resource. #226
 - Bookmark endpoint now also retrieves `og:image` and `og:description` #510
 - Give server agent rights to edit all resources, fix issue with accepting invites in private drives #521
+- Add cookie based authentication #512
 
 ## [v0.33.1] - 2022-09-25
 

server/Cargo.toml

@@ -20,12 +20,14 @@ actix-cors = "0.6"
 actix-files = "0.6"
 actix-multipart = "0.4"
 actix-web-actors = "4"
+base64 = "0.13"
 chrono = "0.4"
 colored = "2"
 dialoguer = "0.10"
 directories = ">= 2, < 5"
 dotenv = "0.15"
 futures = "0.3"
+percent-encoding = "2.2.0"
 promptly = "0.3"
 regex = "1"
 rio_api = "0.7"

server/e2e_tests/e2e-generated.spec.ts

@@ -330,9 +330,9 @@ test.describe('data-browser', async () => {
     ]);
     await fileChooser.setFiles(demoFile);
     await page.click(`[data-test]:has-text("${demoFileName}")`);
-    await expect(
-      await page.locator('[data-test="image-viewer"]'),
-    ).toBeVisible();
+    const image = await page.locator('[data-test="image-viewer"]');
+    await expect(image).toBeVisible();
+    await expect(image).toHaveScreenshot({ maxDiffPixelRatio: 0.1 });
   });
 
   test('chatroom', async ({ page, browser }) => {

server/e2e_tests/test-config.ts

@@ -1,9 +1,9 @@
 import { TestConfig } from "./e2e-generated.spec";
-const demoFileName = 'logo.svg';
+const demoFileName = 'testimage.svg';
 
 export const testConfig: TestConfig = {
   demoFileName,
-  demoFile: `../../${demoFileName}`,
+  demoFile: `./${demoFileName}`,
   demoInviteName: 'document demo',
   serverUrl: 'http://localhost:9883',
   frontEndUrl: 'http://localhost:9883',

server/src/helpers.rs

@@ -1,8 +1,11 @@
 //! Functions useful in the server
 
-use actix_web::http::header::HeaderMap;
+use actix_web::cookie::Cookie;
+use actix_web::http::header::{HeaderMap, HeaderValue};
 use atomic_lib::authentication::AuthValues;
+use percent_encoding::percent_decode_str;
 
+use crate::errors::{AppErrorType, AtomicServerError};
 use crate::{appstate::AppState, content_types::ContentType, errors::AtomicServerResult};
 
 // Returns None if the string is empty.
@@ -56,6 +59,44 @@ pub fn get_auth_headers(
     }
 }
 
+pub fn get_auth_from_cookie(
+    map: &HeaderMap,
+    requested_subject: &String,
+) -> Option<AtomicServerResult<Option<AuthValues>>> {
+    let encoded_session = session_cookie_from_header(map.get("Cookie")?)?;
+
+    let session = base64::decode(encoded_session).ok()?;
+    let session_str = std::str::from_utf8(&session).ok()?;
+    let values: Result<AuthValues, AtomicServerError> =
+        serde_json::from_str(session_str).map_err(|_| AtomicServerError {
+            message: "Malformed authentication resource".to_string(),
+            error_type: AppErrorType::Unauthorized,
+            error_resource: None,
+        });
+
+    if let Ok(auth_values) = values {
+        if auth_values.requested_subject.eq(requested_subject) {
+            return Some(Err(AtomicServerError {
+                message: "Wrong requested subject".to_string(),
+                error_type: AppErrorType::Unauthorized,
+                error_resource: None,
+            }));
+        }
+
+        Some(Ok(Some(auth_values)))
+    } else {
+        Some(Err(values.err().unwrap()))
+    }
+}
+
+pub fn get_auth(
+    map: &HeaderMap,
+    requested_subject: String,
+) -> AtomicServerResult<Option<AuthValues>> {
+    let cookie_result = get_auth_from_cookie(map, &requested_subject);
+    cookie_result.unwrap_or_else(|| get_auth_headers(map, requested_subject))
+}
+
 /// Checks for authentication headers and returns Some agent's subject if everything is well.
 /// Skips these checks in public_mode and returns Ok(None).
 #[tracing::instrument(skip(appstate))]
@@ -68,7 +109,7 @@ pub fn get_client_agent(
         return Ok(None);
     }
     // Authentication check. If the user has no headers, continue with the Public Agent.
-    let auth_header_values = get_auth_headers(headers, requested_subject)?;
+    let auth_header_values = get_auth(headers, requested_subject)?;
     let for_agent = atomic_lib::authentication::get_agent_from_auth_values_and_check(
         auth_header_values,
         &appstate.store,
@@ -94,3 +135,17 @@ pub fn try_extension(path: &str) -> Option<(ContentType, &str)> {
     }
     None
 }
+
+fn session_cookie_from_header(header: &HeaderValue) -> Option<String> {
+    let cookies: Vec<&str> = header.to_str().ok()?.split(';').collect();
+
+    for encoded_cookie in cookies {
+        let cookie = Cookie::parse(encoded_cookie).ok()?;
+        if cookie.name() == "atomic_session" {
+            let decoded = percent_decode_str(cookie.value()).decode_utf8().ok()?;
+            return Some(String::from(decoded));
+        }
+    }
+
+    None
+}