Merge pull request #4331 from wasmerio/validate-nonexistent-packages

Fix visibility validation to work when publishing a new package
wasmerio · Nov 28, 2023 · 476d95d · 476d95d
2 parents 13ded1d + 46f934c
commit 476d95d
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 115 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/registry/src/lib.rs b/lib/registry/src/lib.rs
@@ -111,7 +111,12 @@ impl fmt::Display for QueryPackageError {
         match self {
             QueryPackageError::ErrorSendingQuery(q) => write!(f, "error sending query: {q}"),
             QueryPackageError::NoPackageFound { name, version } => {
-                write!(f, "no package found for {name:?} (version = {version:?})")
+                write!(f, "no package found for {name:?}")?;
+                if let Some(version) = version {
+                    write!(f, " (version = {version:?})")?;
+                }
+
+                Ok(())
             }
         }
     }
@@ -170,9 +175,13 @@ pub fn query_package_from_registry(
             QueryPackageError::ErrorSendingQuery(format!("Error sending GetPackagesQuery: {e}"))
         })?;
 
-    let v = response.package_version.as_ref().ok_or_else(|| {
-        QueryPackageError::ErrorSendingQuery(format!("no package version for {name:?}"))
-    })?;
+    let v = response
+        .package_version
+        .as_ref()
+        .ok_or_else(|| QueryPackageError::NoPackageFound {
+            name: name.to_string(),
+            version: None,
+        })?;
 
     let manifest = toml::from_str::<wasmer_toml::Manifest>(&v.manifest).map_err(|e| {
         QueryPackageError::ErrorSendingQuery(format!("Invalid manifest for crate {name:?}: {e}"))

diff --git a/lib/registry/src/package/builder.rs b/lib/registry/src/package/builder.rs
@@ -640,14 +640,21 @@ mod validate {
         registry: &str,
         auth_token: &str,
     ) -> Result<bool, ValidationError> {
-        let package_version = crate::query_package_from_registry(
+        let result = crate::query_package_from_registry(
             registry,
             &manifest.package.name,
             None,
             Some(auth_token),
-        )?;
+        );
 
-        Ok(package_version.is_private != manifest.package.private)
+        match result {
+            Ok(package_version) => Ok(package_version.is_private != manifest.package.private),
+            Err(QueryPackageError::NoPackageFound { .. }) => {
+                // The package hasn't been published yet
+                Ok(false)
+            }
+            Err(e) => Err(e.into()),
+        }
     }
 
     fn validate_module(