Merge branch 'release/1.5.3'

Author: Robert Roeser

.gitignore

@@ -98,3 +98,8 @@ gradle-app.setting
 ${sys:appHome}
 
 */logs/**
+
+.classpath
+.project
+**/.settings/*
+**/bin/*

build.gradle

@@ -34,8 +34,8 @@ subprojects {
     apply plugin: 'maven-publish'
 
     ext['reactor-bom.version'] = 'Californium-SR1'
-    ext['rsocket.version'] = '0.11.12'
-    ext['rsocket-rpc.version'] = '0.2.10'
+    ext['rsocket.version'] = '0.11.15'
+    ext['rsocket-rpc.version'] = '0.2.12'
 
     ext['jackson.version'] = '2.9.7'
     ext['jackson-protobuf.version'] = '0.9.10-jackson2.9-proto3'
@@ -45,7 +45,7 @@ subprojects {
     ext['junit.version'] = '5.1.0'
     ext['mockito.version'] = '2.23.0'
     ext['hamcrest.version'] = '1.3'
-    ext['jmh.version'] = '1.2.0'
+    ext['jmh.version'] = '1.21'
     ext['micrometer.version'] = '1.0.6'
     ext['assertj.version'] = '3.11.1'
     ext['opentracing.version'] = '0.31.0'
@@ -61,11 +61,11 @@ subprojects {
     project.version += project.hasProperty('versionSuffix') ? project.property('versionSuffix') : ''
 
     repositories {
-        mavenCentral()
         jcenter()
         maven { url 'http://repo.spring.io/libs-snapshot' }
         maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
         maven { url 'https://oss.jfrog.org/oss-release-local' }
+        mavenCentral()
 
     }
 
@@ -145,6 +145,7 @@ subprojects {
                 entry 'junit-vintage-engine'
             }
 
+
             dependencySet(group: 'org.openjdk.jmh', version: ext['jmh.version']) {
                 entry 'jmh-core'
                 entry 'jmh-generator-annprocess'

gradle.properties

@@ -1,2 +1,2 @@
 group=io.netifi.proteus
-version=1.5.2
+version=1.5.3

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
+#Thu Dec 06 23:55:01 PST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -9,17 +9,23 @@ option java_package = "io.netifi.proteus.broker.access";
 option java_outer_classname = "AccessKeyInfo";
 option java_multiple_files = true;
 
+message AccessKeyName {
+  string name = 1;
+}
+
 message AccessKey {
   int64 key = 1;
 }
 
 message AccessKeyParameters {
+  string name = 2;
   string description = 1;
 }
 
 message AccessToken {
   int64 key = 1;
   bytes accessToken = 2;
+  string name = 4;
   string description = 3;
 }
 
@@ -28,6 +34,7 @@ message AccessTokenInfo {
   bytes accessTokenHash = 2;
   bytes accessTokenSalt = 3;
   string accessKeyAlgo = 4;
+  string name = 8;
   string description = 5;
   bool disabled = 6;
   google.protobuf.Timestamp timestamp = 7;
@@ -40,4 +47,5 @@ service AccessKeyInfoService {
   rpc EnableAccessKey (AccessKey) returns (AccessTokenInfo) {}
   rpc GetAccessKey (AccessKey) returns (AccessTokenInfo) {}
   rpc GetAccessKeys (google.protobuf.Empty) returns (stream AccessTokenInfo) {}
+  rpc GetAccessKeyByName (AccessKeyName) returns (AccessTokenInfo) {}
 }

proteus-access-key-info-idl/src/main/proto/proteus/accesskey_info.proto

@@ -1,5 +1,6 @@
 description = 'Netifi Proteus Authentication Utilities'
 
 dependencies {
+    compile project (':proteus-common')
     compile 'io.netty:netty-buffer'
 }

proteus-auth/build.gradle

@@ -1,5 +1,6 @@
 package io.netifi.proteus.auth;
 
+import io.netifi.proteus.common.time.Clock;
 import io.netty.buffer.ByteBuf;
 import java.nio.ByteBuffer;
 import javax.crypto.Mac;
@@ -22,7 +23,7 @@ protected ByteBuffer initialValue() {
   }
 
   DefaultSessionUtil() {
-    this(new DefaultSystemClock());
+    this(Clock.DEFAULT);
   }
 
   @Override