WIP

Author: joepio

lib/src/atomic_url.rs

@@ -112,7 +112,7 @@ impl AtomicUrl {
     }
 
     /// Removes existing path, sets the new one. Escapes special characters
-    pub fn set_path(&mut self, path: &str) -> &Self {
+    pub fn set_path(mut self, path: &str) -> Self {
         self.url.set_path(path);
         self
     }

lib/src/plugins/mod.rs

@@ -44,5 +44,6 @@ pub mod bookmark;
 pub mod files;
 pub mod path;
 pub mod register;
+pub mod reset_pubkey;
 pub mod search;
 pub mod versioning;

lib/src/plugins/register.rs

@@ -14,7 +14,7 @@ use crate::{
 
 pub fn register_endpoint() -> Endpoint {
     Endpoint {
-      path: "/register".to_string(),
+      path: urls::PATH_REGISTER.to_string(),
       params: [
         urls::NAME.to_string(),
         urls::EMAIL.to_string(),
@@ -27,7 +27,7 @@ pub fn register_endpoint() -> Endpoint {
 
 pub fn confirm_email_endpoint() -> Endpoint {
     Endpoint {
-        path: "/confirmEmail".to_string(),
+        path: urls::PATH_CONFIRM_EMAIL.to_string(),
         params: [urls::TOKEN.to_string(), urls::INVITE_PUBKEY.to_string()].into(),
         description: "Confirm email address and set a key for your Agent.".to_string(),
         shortname: "confirm-email".to_string(),
@@ -113,6 +113,7 @@ pub fn construct_confirm_email_redirect(
     let mut token_opt: Option<String> = None;
     let mut pubkey_option = None;
 
+    println!("url: {:?}", url);
     for (k, v) in url.query_pairs() {
         match k.as_ref() {
             "token" | urls::TOKEN => token_opt = Some(v.to_string()),
@@ -134,11 +135,15 @@ pub fn construct_confirm_email_redirect(
     // Note: this happens before the drive is saved, which checks if the name is available.
     // We get new agents that just do nothing, but perhaps that's not a problem.
     let drive_creator_agent: String = {
-        let mut new = Agent::new_from_public_key(store, &pubkey)?;
-        new.name = Some(confirmation.name.clone());
-        let net_agent_subject = new.subject.to_string();
-        new.to_resource()?.save(store)?;
-        net_agent_subject
+        let mut new_agent = Agent::new_from_public_key(store, &pubkey)?;
+        new_agent.name = Some(confirmation.name.clone());
+        let net_agent_subject = store
+            .get_server_url()
+            .clone()
+            .set_path(&format!("agents/{}", confirmation.name));
+        new_agent.subject = net_agent_subject.to_string();
+        new_agent.to_resource()?.save(store)?;
+        net_agent_subject.to_string()
     };
 
     // Create the new Drive

lib/src/plugins/reset_pubkey.rs

@@ -0,0 +1,70 @@
+/*!
+Reset email
+*/
+
+use crate::{endpoints::Endpoint, errors::AtomicResult, urls, Db, Resource};
+
+pub fn request_email_pubkey_reset() -> Endpoint {
+    Endpoint {
+        path: urls::PATH_RESET_PUBKEY.to_string(),
+        params: [urls::TOKEN.to_string(), urls::INVITE_PUBKEY.to_string()].into(),
+        description: "Requests an email to set a new PublicKey to an Agent.".to_string(),
+        shortname: "request-pubkey-reset".to_string(),
+        handle: Some(construct_reset_pubkey),
+    }
+}
+
+pub fn confirm_pubkey_reset() -> Endpoint {
+    Endpoint {
+        path: urls::PATH_CONFIRM_RESET.to_string(),
+        params: [urls::TOKEN.to_string(), urls::INVITE_PUBKEY.to_string()].into(),
+        description: "Requests an email to set a new PublicKey to an Agent.".to_string(),
+        shortname: "request-pubkey-reset".to_string(),
+        handle: Some(construct_confirm_reset_pubkey),
+    }
+}
+
+#[tracing::instrument(skip(store))]
+pub fn construct_confirm_reset_pubkey(
+    url: url::Url,
+    store: &Db,
+    for_agent: Option<&str>,
+) -> AtomicResult<Resource> {
+    let mut token_opt: Option<String> = None;
+    let mut pubkey_option = None;
+
+    println!("url: {:?}", url);
+    for (k, v) in url.query_pairs() {
+        match k.as_ref() {
+            "token" | urls::TOKEN => token_opt = Some(v.to_string()),
+            "public-key" | urls::INVITE_PUBKEY => pubkey_option = Some(v.to_string()),
+            _ => {}
+        }
+    }
+    let Some(token) = token_opt else {
+        return confirm_pubkey_reset().to_resource(store);
+    };
+    let pubkey = pubkey_option.ok_or("No public-key provided")?;
+
+    // Parse and verify the JWT token
+    let confirmation = crate::token::verify_claim::<MailConfirmation>(store, &token)?.custom;
+
+    // Add the drive to the Agent's list of drives
+    let mut agent = store.get_resource(&drive_creator_agent)?;
+    agent.push_propval(
+        urls::USED_PUBKEYS.into(),
+        SubResource::Subject(drive.get_subject().into()),
+        true,
+    )?;
+    agent.save_locally(store)?;
+
+    // Construct the Redirect Resource, which might provide the Client with a Subject for his Agent.
+    let mut redirect = Resource::new_instance(urls::REDIRECT, store)?;
+    redirect.set_propval_string(urls::DESTINATION.into(), drive.get_subject(), store)?;
+    redirect.set_propval(
+        urls::REDIRECT_AGENT.into(),
+        crate::Value::AtomicUrl(drive_creator_agent),
+        store,
+    )?;
+    Ok(redirect)
+}

lib/src/storelike.rs

@@ -235,6 +235,7 @@ pub trait Storelike: Sized {
             if subject.starts_with(self_url.as_str()) {
                 return Ok(false);
             } else {
+                // Is it a subdomain of the self_url?
                 let subject_url = url::Url::parse(subject)?;
                 let subject_host = subject_url.host().ok_or_else(|| {
                     AtomicError::not_found(format!("Subject URL has no host: {}", subject))
@@ -243,8 +244,20 @@ pub trait Storelike: Sized {
                 let self_host = self_url.host().ok_or_else(|| {
                     AtomicError::not_found(format!("Self URL has no host: {}", self_url))
                 })?;
-                info!("Comparing hosts: {} and {}", subject_host, self_host);
-                if subject_host == self_host {
+                // remove the subdomain from subject, if any.
+                // The server can have multiple subdomains
+                let subject_host_string = subject_host.to_string();
+                let subject_host_parts = subject_host_string.split('.').collect::<Vec<&str>>();
+
+                // Check if the last part of the host is equal
+                let Some(subject_host_stripped) = subject_host_parts.last() else {
+                    return Ok(false)
+                };
+                info!(
+                    "Comparing hosts: {} and {}",
+                    subject_host_stripped, self_host
+                );
+                if subject_host_stripped == &self_host.to_string() {
                     return Ok(false);
                 }
             }

lib/src/urls.rs

@@ -142,3 +142,7 @@ pub const PATH_TPF: &str = "/tpf";
 pub const PATH_PATH: &str = "/path";
 pub const PATH_COMMITS: &str = "/commits";
 pub const PATH_ENDPOINTS: &str = "/endpoints";
+pub const PATH_REGISTER: &str = "/register";
+pub const PATH_CONFIRM_EMAIL: &str = "/confirm-email";
+pub const PATH_RESET_PUBKEY: &str = "/reset-public-key";
+pub const PATH_CONFIRM_RESET: &str = "/confirm-reset-public-key";

server/app_assets/dist/index.js

@@ -107,10 +107,11 @@ test.describe('data-browser', async () => {
     await editProfileAndCommit(page);
   });
 
-  test('search', async ({ page }) => {
-    await page.fill(addressBar, 'setup');
-    await page.click('text=setup');
-    await expect(page.locator('text=Use this Invite')).toBeVisible();
+  test('text search', async ({ page }) => {
+    await page.fill(addressBar, 'welcome');
+    await expect(page.locator('text=Welcome to your')).toBeVisible();
+    await page.keyboard.press('Enter');
+    await expect(page.locator('text=resources:')).toBeVisible();
   });
 
   test('scoped search', async ({ page }) => {

server/app_assets/dist/index.js.map

@@ -13,7 +13,7 @@ pub async fn post_commit(
     let mut builder = HttpResponse::Ok();
     let incoming_commit_resource = parse_json_ad_commit_resource(&body, store)?;
     let incoming_commit = Commit::from_resource(incoming_commit_resource)?;
-    if store.is_external_subject(&incoming_commit.subject)? {
+if store.is_external_subject(&incoming_commit.subject)? {
         return Err("Subject of commit is external, and should be sent to its origin domain. This store can not own this resource. See https://github.com/atomicdata-dev/atomic-data-rust/issues/509".into());
     }
     let opts = CommitOpts {