Merge pull request #39 from afbase/afbase/aturi-validation-rsky-syntax

Afbase/aturi validation rsky syntax by @afbase

Author: rudyfraser

rsky-pds/src/repo/record/mod.rs

@@ -10,6 +10,8 @@ use futures::stream::{self, StreamExt};
 use lexicon_cid::Cid;
 use rsky_lexicon::com::atproto::admin::StatusAttr;
 use rsky_syntax::aturi::AtUri;
+use rsky_syntax::aturi_validation::ensure_valid_at_uri;
+use rsky_syntax::did::ensure_valid_did;
 use serde_json::Value as JsonValue;
 use std::env;
 use std::str::FromStr;
@@ -40,12 +42,16 @@ pub fn get_backlinks(uri: &AtUri, record: &RepoRecord) -> Result<Vec<models::Bac
             || record_type == Ids::AppBskyGraphBlock.as_str()
         {
             if let Some(Lex::Ipld(Ipld::Json(JsonValue::String(subject)))) = record.get("subject") {
-                // @TODO: Ensure valid DID https://github.com/bluesky-social/atproto/blob/main/packages/syntax/src/did.ts
-                return Ok(vec![models::Backlink {
-                    uri: uri.to_string(),
-                    path: "subject".to_owned(),
-                    link_to: subject.clone(),
-                }]);
+                match ensure_valid_did(&uri) {
+                    Ok(_) => {
+                        return Ok(vec![models::Backlink {
+                            uri: uri.to_string(),
+                            path: "subject".to_owned(),
+                            link_to: subject.clone(),
+                        }])
+                    },
+                    Err(e) => bail!("get_backlinks Error: invalid did {}", e),
+                };
             }
         } else if record_type == Ids::AppBskyFeedLike.as_str()
             || record_type == Ids::AppBskyFeedRepost.as_str()
@@ -54,12 +60,15 @@ pub fn get_backlinks(uri: &AtUri, record: &RepoRecord) -> Result<Vec<models::Bac
                 if let Some(Lex::Ipld(Ipld::Json(JsonValue::String(subject_uri)))) =
                     ref_object.get("uri")
                 {
-                    // TO DO: Ensure valid AT URI
-                    return Ok(vec![models::Backlink {
-                        uri: uri.to_string(),
-                        path: "subject.uri".to_owned(),
-                        link_to: subject_uri.clone(),
-                    }]);
+                    match ensure_valid_at_uri(&uri) {
+                        Ok(_) => {
+                            return Ok(vec![models::Backlink {
+                            uri: uri.to_string(),
+                            path: "subject.uri".to_owned(),
+                            link_to: subject_uri.clone(),
+                        }])},
+                        Err(e) => bail!("get_backlinks Error: invalid AtUri {}", e)
+                    };
                 }
             }
         }

rsky-syntax/ATURI_VALIDATION.md

@@ -0,0 +1,13 @@
+# Notes on AT-URI Validation
+
+At the time of writing this, this rsky-syntax validation of AT-URI reflects the Typescript implementation of the [syntax package](https://github.com/bluesky-social/atproto/tree/main/packages/syntax) instead of the atproto.com [specification](https://atproto.com/specs/at-uri-scheme).  There are some differences with the typescript and rust validation implementations and the specification for AT URIs:
+
+  - The validation conforms more to the "Full AT URI Syntax" form than the "Restricted AT URI Syntax" that is used in the [lexicon](https://github.com/bluesky-social/atproto/tree/main/packages/lexicon).  
+  - The Rust AT-URI validation does admit some invalid syntax.
+  - The Rust DID and Handle validation adheres to the specification.
+  - The Rust NSID and TID validation adheres to the specification.
+  - The Rust Record Key validation adheres to the specification.
+
+  # References
+
+  1. [rsky-syntax PR](https://github.com/blacksky-algorithms/rsky/pull/39).

rsky-syntax/Cargo.toml

@@ -12,9 +12,10 @@ documentation = "https://docs.rs/rsky-syntax"
 
 [dependencies]
 anyhow = "1.0.86"
+chrono = "0.4.39"
 lazy_static = "1.5.0"
 regex = "1.10.5"
 serde = { version = "1.0.160", features = ["derive"] }
 serde_derive = "^1.0"
 thiserror = "1.0.40"
-url = "2.5.2"
+url = "2.5.2"