Read all version info from manifest

Author: emlun

test-dependent-projects/java-dep-webauthn-server-core/src/test/java/com/yubico/webauthn/meta/VersionInfoTest.java

@@ -27,12 +27,12 @@ public void specPropertiesAreSet() {
     public void implementationPropertiesAreSet() {
         final Implementation impl = versionInfo.getImplementation();
         assertTrue(impl.getSourceCodeUrl().toExternalForm().startsWith("https://"));
-        assertTrue(impl.getVersion().get().matches("^\\d+\\.\\d+\\.\\d+(-.*)?"));
+        assertTrue(impl.getVersion().matches("^\\d+\\.\\d+\\.\\d+(-.*)?"));
     }
 
     @Test
     public void majorVersionIsAtLeast1() {
-        final String version = versionInfo.getImplementation().getVersion().get();
+        final String version = versionInfo.getImplementation().getVersion();
         String[] splits = version.split("\\.");
         final int majorVersion = Integer.parseInt(splits[0]);
         assertTrue(majorVersion >= 1);

webauthn-server-core/build.gradle

@@ -44,10 +44,17 @@ jar {
       'Specification-Title': 'Web Authentication: An API for accessing Public Key Credentials',
       'Specification-Version': 'Level 1 Recommendation 2019-03-04',
       'Specification-Vendor': 'World Wide Web Consortium',
+
+      'Specification-Url': 'https://www.w3.org/TR/2019/REC-webauthn-1-20190304/',
+      'Specification-Url-Latest': 'https://www.w3.org/TR/webauthn/',
+      'Specification-W3c-Status': 'recommendation',
+      'Specification-Release-Date': '2019-03-04',
+
       'Implementation-Id': 'java-webauthn-server',
       'Implementation-Title': 'Yubico Web Authentication server library',
       'Implementation-Version': project.version,
       'Implementation-Vendor': 'Yubico',
+      'Implementation-Source-Url': 'https://github.com/Yubico/java-webauthn-server',
     ])
   }
 }

webauthn-server-core/src/main/java/com/yubico/webauthn/meta/DocumentStatus.java

@@ -27,7 +27,10 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yubico.internal.util.json.JsonStringSerializable;
 import com.yubico.internal.util.json.JsonStringSerializer;
+import java.util.Optional;
+import java.util.stream.Stream;
 import lombok.AllArgsConstructor;
+import lombok.NonNull;
 
 /**
  * A representation of Web Authentication specification document statuses.
@@ -62,6 +65,10 @@ public enum DocumentStatus implements JsonStringSerializable {
 
     private final String id;
 
+    static Optional<DocumentStatus> fromString(@NonNull String id) {
+        return Stream.of(values()).filter(v -> v.id.equals(id)).findAny();
+    }
+
     /**
      * Used by JSON serializer.
      */

webauthn-server-core/src/main/java/com/yubico/webauthn/meta/Implementation.java

@@ -42,6 +42,7 @@ public class Implementation {
     /**
      * The version number of this release of the library.
      */
+    @NonNull
     private final String version;
 
     /**
@@ -50,8 +51,4 @@ public class Implementation {
     @NonNull
     private final URL sourceCodeUrl;
 
-    public Optional<String> getVersion() {
-        return Optional.ofNullable(version);
-    }
-
 }

webauthn-server-core/src/main/java/com/yubico/webauthn/meta/VersionInfo.java

@@ -29,10 +29,9 @@
 import java.net.URL;
 import java.time.LocalDate;
 import java.util.Enumeration;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.jar.Manifest;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 
@@ -64,35 +63,34 @@ public static VersionInfo getInstance() {
      * Represents the specification this implementation is based on
      */
     private final Specification specification = Specification.builder()
-        .url(new URL("https://www.w3.org/TR/2019/REC-webauthn-1-20190304/"))
-        .latestVersionUrl(new URL("https://www.w3.org/TR/webauthn/"))
-        .status(DocumentStatus.RECOMMENDATION)
-        .releaseDate(LocalDate.parse("2019-03-04"))
+        .url(new URL(findValueInManifest("Specification-Url")))
+        .latestVersionUrl(new URL(findValueInManifest("Specification-Url-Latest")))
+        .status(DocumentStatus.fromString(findValueInManifest("Specification-W3c-Status")).get())
+        .releaseDate(LocalDate.parse(findValueInManifest("Specification-Release-Date")))
         .build();
 
     /**
      * Description of this version of this library
      */
     private final Implementation implementation = new Implementation(
-        findImplementationVersionInManifest().orElse(null),
-        new URL("https://github.com/Yubico/java-webauthn-server")
+        findValueInManifest("Implementation-Version"),
+        new URL(findValueInManifest("Implementation-Source-Url"))
     );
 
     private VersionInfo() throws IOException {
     }
 
-    private Optional<String> findImplementationVersionInManifest() throws IOException {
+    private String findValueInManifest(String key) throws IOException {
         final Enumeration<URL> resources = getClass().getClassLoader().getResources("META-INF/MANIFEST.MF");
 
         while (resources.hasMoreElements()) {
             final URL resource = resources.nextElement();
             final Manifest manifest = new Manifest(resource.openStream());
             if ("java-webauthn-server".equals(manifest.getMainAttributes().getValue("Implementation-Id"))) {
-                return Optional.ofNullable(manifest.getMainAttributes().getValue("Implementation-Version"));
+                return manifest.getMainAttributes().getValue(key);
             }
         }
-
-        return Optional.empty();
+        throw new NoSuchElementException("Could not find \"" + key + "\" in manifest.");
     }
 
 }