Merge pull request #67 from reddevilmidzy/test-url

링크 유효 검증 추가

Author: reddevilmidzy

rook/src/link/mod.rs

@@ -39,7 +39,7 @@ mod tests {
 
     #[tokio::test]
     async fn validate_link() {
-        let link = "https://redddy.com";
+        let link = "https://redddy.ai";
         assert!(matches!(
             check_link(link).await,
             LinkCheckResult::Invalid(_)

rook/src/main.rs

@@ -10,6 +10,9 @@ use std::time::Duration;
 use tracing::{Level, error, info};
 use tracing_subscriber::FmtSubscriber;
 
+const GITHUB_BASE_URL: &str = "https://github.com/";
+const GITHUB_URL_FORMAT: &str = "https://github.com/{owner}/{repo_name}";
+
 async fn spawn_repository_checker(
     repo_url: &str,
     branch: Option<String>,
@@ -33,20 +36,20 @@ async fn health_check() -> &'static str {
 
 #[derive(Deserialize)]
 struct CheckRequest {
-    repo_url: String,
+    repo: RepositoryURL,
     branch: Option<String>,
     interval_secs: Option<u64>,
 }
 
 async fn check_handler(Json(payload): Json<CheckRequest>) -> Result<&'static str, StatusCode> {
     info!(
         "Received check request for repository: {}, branch: {:?}",
-        payload.repo_url, payload.branch
+        payload.repo.url, payload.branch
     );
     // FIXME 일단 interval_secs 는 유저가 수정할 수 없게 할 거긴 한데, 일단 테스트할 때 편하게 요청을 받아보자.
     let interval = payload.interval_secs.unwrap_or(120);
     let interval = Duration::from_secs(interval);
-    if let Err(e) = spawn_repository_checker(&payload.repo_url, payload.branch, interval).await {
+    if let Err(e) = spawn_repository_checker(&payload.repo.url, payload.branch, interval).await {
         error!("Failed to spawn repository checker: {}", e);
         return Err(StatusCode::BAD_REQUEST);
     }
@@ -55,12 +58,56 @@ async fn check_handler(Json(payload): Json<CheckRequest>) -> Result<&'static str
 
 #[derive(Deserialize)]
 struct CancelRequest {
-    repo_url: String,
+    repo: RepositoryURL,
     branch: Option<String>,
 }
 
+/// Represents a GitHub repository URL.
+///
+/// This struct ensures that the URL is valid and follows the format
+/// `https://github.com/{owner}/{repo_name}`. It includes validation logic
+/// to enforce this format.
+#[derive(Debug, Clone)]
+struct RepositoryURL {
+    /// The URL of the repository.
+    url: String,
+}
+
+impl<'de> Deserialize<'de> for RepositoryURL {
+    /// Custom deserialization logic for `RepositoryURL`.
+    ///
+    /// This implementation ensures that the URL is validated during
+    /// deserialization. If the URL is invalid, an error is returned.
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let url = String::deserialize(deserializer)?;
+        let repo = RepositoryURL { url };
+        repo.validate().map_err(serde::de::Error::custom)?;
+        Ok(repo)
+    }
+}
+
+impl RepositoryURL {
+    fn validate(&self) -> Result<(), String> {
+        if !self.url.starts_with(GITHUB_BASE_URL) {
+            return Err(format!("URL must start with {}", GITHUB_BASE_URL));
+        }
+        let parts: Vec<&str> = self
+            .url
+            .trim_start_matches(GITHUB_BASE_URL)
+            .split('/')
+            .collect();
+        if parts.len() != 2 || parts[0].is_empty() || parts[1].is_empty() {
+            return Err(format!("URL must be in format {}", GITHUB_URL_FORMAT));
+        }
+        Ok(())
+    }
+}
+
 async fn cancel_handler(Json(payload): Json<CancelRequest>) -> Result<&'static str, StatusCode> {
-    if let Err(e) = cancel_repository_checker(&payload.repo_url, payload.branch).await {
+    if let Err(e) = cancel_repository_checker(&payload.repo.url, payload.branch).await {
         error!("Repository checker failed: {}", e);
         return Err(StatusCode::BAD_REQUEST);
     }

rook/src/main_test.rs

@@ -0,0 +1,34 @@
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn test_repository_url_deserialization() {
+        // Valid URLs
+        let valid_url = json!({ "url": "https://github.com/owner/repo" });
+        assert!(serde_json::from_value::<RepositoryURL>(valid_url).is_ok());
+
+        let valid_url = json!({ "url": "https://github.com/rust-lang/rust" });
+        assert!(serde_json::from_value::<RepositoryURL>(valid_url).is_ok());
+
+        // Invalid URLs
+        let invalid_url = json!({ "url": "https://gitlab.com/owner/repo" });
+        assert!(serde_json::from_value::<RepositoryURL>(invalid_url).is_err());
+
+        let invalid_url = json!({ "url": "https://github.com/" });
+        assert!(serde_json::from_value::<RepositoryURL>(invalid_url).is_err());
+
+        let invalid_url = json!({ "url": "https://github.com/owner" });
+        assert!(serde_json::from_value::<RepositoryURL>(invalid_url).is_err());
+
+        let invalid_url = json!({ "url": "https://github.com/owner/" });
+        assert!(serde_json::from_value::<RepositoryURL>(invalid_url).is_err());
+
+        let invalid_url = json!({ "url": "http://github.com/owner/repo" });
+        assert!(serde_json::from_value::<RepositoryURL>(invalid_url).is_err());
+
+        let invalid_url = json!({ "url": "https://github.com//repo" });
+        assert!(serde_json::from_value::<RepositoryURL>(invalid_url).is_err());
+    }
+}