Release 0.2.0

- Source code translated from Scala to Java

Author: emlun

NEWS

@@ -1,10 +1,17 @@
+== Version 0.2.0 ==
+
+* Core library now recognises username as an internally relevant concept
+* Source code translated from Scala to Java
+* Too many other changes to count
+
+
 == Version 0.1.0 ==
 
 * First release of https://www.w3.org/TR/webauthn/[Web Authentication] support
 * Merged U2F subprojects into webauthn-server-core and deleted lots of unused code
 
 
-= java-u2flib-server version history =
+== java-u2flib-server version history ==
 
 This project was forked from https://developers.yubico.com/java-u2flib-server/[java-u2flib-server]. Below is the version history from before the fork.
 

README

@@ -13,9 +13,6 @@ https://www.w3.org/TR/webauthn/#rp-operations[Relying Party operations] required
 for a server to support Web Authentication. This includes registering
 authenticators and authenticating registered authenticators.
 
-The project is currently implemented mostly in Scala; this is intended to be
-translated to Java when the specification and these APIs seem stable enough.
-
 
 === Example Usage
 

build.gradle

@@ -3,7 +3,10 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.1.11'
+    configurations.maybeCreate('pitest')
+    classpath 'com.cinnober.gradle:semver-git:2.3.1'
+    classpath 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.3.0'
+    pitest 'org.pitest:pitest-command-line:1.4.2' // Transitive dependency from pitest plugin
   }
 }
 plugins {
@@ -24,10 +27,13 @@ if (publishEnabled) {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '4.5.1'
+  gradleVersion = '4.8'
 }
 
 allprojects  {
+  ext.snapshotSuffix = "<count>.g<sha>-SNAPSHOT"
+
+  apply plugin: 'com.cinnober.gradle.semver-git'
   apply plugin: 'java'
   apply plugin: 'maven'
   apply plugin: 'signing'
@@ -42,10 +48,9 @@ allprojects  {
   }
 
   group = 'com.yubico'
-  version = '0.1.0'
 
-  sourceCompatibility = 1.6
-  targetCompatibility = 1.6
+  sourceCompatibility = 1.8
+  targetCompatibility = 1.8
 
   tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
@@ -59,11 +64,17 @@ allprojects  {
 
 
   idea.module { downloadJavadoc = true }
+
+  test {
+    failFast = true
+  }
 }
 
 evaluationDependsOnChildren()
 
 subprojects {
+  apply plugin: 'info.solidsoft.pitest'
+
   task packageSources(type: Jar) {
     classifier = 'sources'
     from sourceSets.main.allSource
@@ -79,7 +90,7 @@ subprojects {
 
   dependencies {
 
-    compileOnly 'org.projectlombok:lombok:1.16.18'
+    compileOnly 'org.projectlombok:lombok:1.18.2'
 
     compile(
       'org.slf4j:slf4j-api:1.7.25',
@@ -90,10 +101,6 @@ subprojects {
       [group: 'org.mockito', name: 'mockito-core', version:'2.8.47'],
     )
 
-    testRuntime(
-      'org.slf4j:slf4j-simple:1.7.25',
-    )
-
   }
 
   if (publishEnabled) {
@@ -142,13 +149,9 @@ subprojects {
     }
   }
 
-}
-
-subprojects {
-  apply plugin: 'info.solidsoft.pitest'
-
   pitest {
-    pitestVersion = '1.2.2'
+    pitestVersion = '1.4.2'
+
     timestampedReports = false
     outputFormats = ['XML', 'HTML']
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -14,25 +14,44 @@ dependencies {
     [group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version:'1.54'],
     'com.augustcellars.cose:cose-java:0.9.4',
     [group: 'com.google.guava', name: 'guava', version:'19.0'],
-    [group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.6.5'],
-    [group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version:'2.6.5'],
-    'org.scala-lang:scala-library:2.11.3'
+    [group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.9.6'],
+    [group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version:'2.9.6'],
   )
 
   testCompile(
     'commons-io:commons-io:2.5',
     'org.mockito:mockito-core:2.10.0',
+    'org.scala-lang:scala-library:2.11.3',
     'org.scalatest:scalatest_2.11:3.0.4',
     'org.scalacheck:scalacheck_2.11:1.13.5',
   )
 
+  testRuntime(
+    'org.slf4j:slf4j-simple:1.7.25',
+  )
+
   scalaRepl(
     'org.scala-lang:scala-compiler:2.11.3',
     jar.outputs.files,
   )
 
 }
 
+
+jar {
+  manifest {
+    attributes([
+      'Specification-Title': 'Web Authentication: An API for accessing Public Key Credentials',
+      'Specification-Version': 'Level 1 Candidate Recommendation 2018-03-20',
+      'Specification-Vendor': 'World Wide Web Consortium',
+      'Implementation-Id': 'java-webauthn-server',
+      'Implementation-Title': 'Yubico Web Authentication server library',
+      'Implementation-Version': project.version,
+      'Implementation-Vendor': 'Yubico',
+    ])
+  }
+}
+
 def scalaReplDistDir = file(Paths.get(project.distsDir.path, 'scala-repl'))
 task scalaReplClasspath(type: Sync) {
   from configurations.scalaRepl

webauthn-server-core/build.gradle

@@ -8,19 +8,21 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
-import com.yubico.u2f.data.messages.json.JsonSerializable;
 import com.yubico.u2f.exceptions.U2fBadConfigurationException;
-import com.yubico.u2f.exceptions.U2fBadInputException;
+import com.yubico.webauthn.util.WebAuthnCodecs;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import lombok.EqualsAndHashCode;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode(of = { "data" }, callSuper = false)
-public class MetadataObject extends JsonSerializable {
+public class MetadataObject {
+    private static final ObjectMapper OBJECT_MAPPER = WebAuthnCodecs.json();
+
     private static final TypeReference<Map<String, String>> MAP_STRING_STRING_TYPE = new TypeReference<Map<String, String>>() {
     };
     private static final TypeReference LIST_STRING_TYPE = new TypeReference<List<String>>() {
@@ -55,7 +57,6 @@ public MetadataObject(JsonNode data) throws U2fBadConfigurationException {
         version = data.get("version").asLong();
     }
 
-    @Override
     public String toJson() {
         return data.toString();
     }
@@ -100,8 +101,8 @@ public static List<MetadataObject> parseFromJson(String jsonData) throws U2fBadC
 
     public static MetadataObject fromJson(String json) throws U2fBadConfigurationException {
         try {
-            return fromJson(json, MetadataObject.class);
-        } catch (U2fBadInputException e) {
+            return OBJECT_MAPPER.readValue(json, MetadataObject.class);
+        } catch (IOException e) {
             throw new U2fBadConfigurationException("Malformed data", e);
         }
     }