You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2017/08/03 15:50:47 UTC
directory-kerby git commit: Adding modernizer plugin
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 337af9b72 -> 8053f03aa
Adding modernizer plugin
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/8053f03a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/8053f03a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/8053f03a
Branch: refs/heads/trunk
Commit: 8053f03aac22aac59ddea7ae982440cd2752ef14
Parents: 337af9b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Aug 3 16:46:37 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Aug 3 16:46:37 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/kerby/util/Hex.java | 2 +-
.../java/org/apache/kerby/util/ReadLine.java | 2 +-
.../main/java/org/apache/kerby/util/Util.java | 4 ++--
.../admin/server/kadmin/AdminServerHandler.java | 4 ++--
.../kerberos/kerb/common/PublicKeyReader.java | 11 +++++-----
.../preauth/pkinit/PkinitPlgCryptoContext.java | 6 +++---
.../kerby/kerberos/kerb/crypto/dh/DhGroup.java | 6 +++---
.../kerberos/kerb/crypto/key/Rc4KeyMaker.java | 22 ++++++++------------
.../kerberos/kerb/gss/impl/GssNameElement.java | 10 ++-------
pom.xml | 18 ++++++++++++++++
10 files changed, 47 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Hex.java
----------------------------------------------------------------------
diff --git a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Hex.java b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Hex.java
index ec61298..f3ea699 100644
--- a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Hex.java
+++ b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Hex.java
@@ -59,7 +59,7 @@ public class Hex {
}
public static String encode(byte[] b, int offset, int length) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
int len = Math.min(offset + length, b.length);
for (int i = offset; i < len; i++) {
int c = (int) b[i];
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/ReadLine.java
----------------------------------------------------------------------
diff --git a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/ReadLine.java b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/ReadLine.java
index f7a1db0..4b398a4 100644
--- a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/ReadLine.java
+++ b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/ReadLine.java
@@ -45,7 +45,7 @@ public class ReadLine {
if (lines < 1) {
lines = 1;
}
- StringBuffer buf = new StringBuffer(128 * lines);
+ StringBuilder buf = new StringBuilder(128 * lines);
if (avail <= 0 || pos >= avail) {
pos = 0;
avail = in.read(bytes);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Util.java
----------------------------------------------------------------------
diff --git a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Util.java b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Util.java
index d247030..f633f22 100644
--- a/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Util.java
+++ b/kerby-common/kerby-util/src/main/java/org/apache/kerby/util/Util.java
@@ -309,7 +309,7 @@ public class Util {
if (diff == 0) {
return s;
} else if (diff > 0) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (left) {
for (int i = 0; i < diff; i++) {
sb.append(' ');
@@ -360,7 +360,7 @@ public class Util {
}
if (st.hasMoreTokens()) {
String tok = st.nextToken();
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(tok);
if (st.hasMoreTokens()) {
tok = st.nextToken();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
index 775a4f9..43b042b 100644
--- a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
+++ b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
@@ -232,8 +232,8 @@ public class AdminServerHandler {
if (list.size() <= 0) {
return null;
}
- //Both speed and safety,so use StringBuffer
- StringBuffer result = new StringBuffer();
+ //Both speed and safety,so use StringBuilder
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < list.size(); i++) {
result.append(list.get(i)).append(" ");
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PublicKeyReader.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PublicKeyReader.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PublicKeyReader.java
index 988d259..66f2c48 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PublicKeyReader.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/PublicKeyReader.java
@@ -21,6 +21,7 @@ package org.apache.kerby.kerberos.kerb.common;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.security.KeyFactory;
import java.security.PublicKey;
import java.security.cert.Certificate;
@@ -35,12 +36,12 @@ public class PublicKeyReader {
public static PublicKey loadPublicKey(InputStream in) throws Exception {
byte[] keyBytes = IOUtils.toByteArray(in);
-
+
try {
return loadPublicKey(keyBytes);
} catch (InvalidKeySpecException ex) {
// It might be a Certificate and not a PublicKey...
- Certificate cert =
+ Certificate cert =
CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(keyBytes));
return cert.getPublicKey();
}
@@ -48,15 +49,15 @@ public class PublicKeyReader {
public static PublicKey loadPublicKey(byte[] publicKeyBytes) throws Exception {
- String pubKey = new String(publicKeyBytes, "UTF-8");
+ String pubKey = new String(publicKeyBytes, StandardCharsets.UTF_8);
if (pubKey.startsWith("-----BEGIN PUBLIC KEY-----")) {
// PEM format
pubKey = pubKey.replace("-----BEGIN PUBLIC KEY-----", "");
pubKey = pubKey.replace("-----END PUBLIC KEY-----", "");
-
+
Base64 base64 = new Base64();
byte[] buffer = base64.decode(pubKey.trim());
-
+
KeyFactory keyFactory = KeyFactory.getInstance("RSA");
X509EncodedKeySpec keySpec = new X509EncodedKeySpec(buffer);
return keyFactory.generatePublic(keySpec);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java
index 03b8f60..2d92519 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/preauth/pkinit/PkinitPlgCryptoContext.java
@@ -46,7 +46,7 @@ public class PkinitPlgCryptoContext {
* The prime is 2^1024 - 2^960 - 1 + 2^64 * { [2^894 pi] + 129093 }.
*/
public BigInteger getPkinit1024Prime() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1");
sb.append("29024E088A67CC74020BBEA63B139B22514A08798E3404DD");
sb.append("EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245");
@@ -64,7 +64,7 @@ public class PkinitPlgCryptoContext {
* This prime is: 2^2048 - 2^1984 - 1 + 2^64 * { [2^1918 pi] + 124476 }
*/
public BigInteger getPkinit2048Prime() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1");
sb.append("29024E088A67CC74020BBEA63B139B22514A08798E3404DD");
sb.append("EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245");
@@ -87,7 +87,7 @@ public class PkinitPlgCryptoContext {
* This prime is: 2^4096 - 2^4032 - 1 + 2^64 * { [2^3966 pi] + 240904 }
*/
public BigInteger getPkinit4096Prime() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1");
sb.append("29024E088A67CC74020BBEA63B139B22514A08798E3404DD");
sb.append("EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245");
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhGroup.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhGroup.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhGroup.java
index 7845295..f71f5d9 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhGroup.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/dh/DhGroup.java
@@ -46,7 +46,7 @@ public class DhGroup {
public static final DHParameterSpec MODP_GROUP2;
static {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1");
sb.append("29024E088A67CC74020BBEA63B139B22514A08798E3404DD");
sb.append("EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245");
@@ -73,7 +73,7 @@ public class DhGroup {
public static final DHParameterSpec MODP_GROUP14;
static {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1");
sb.append("29024E088A67CC74020BBEA63B139B22514A08798E3404DD");
sb.append("EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245");
@@ -105,7 +105,7 @@ public class DhGroup {
public static final DHParameterSpec MODP_GROUP16;
static {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1");
sb.append("29024E088A67CC74020BBEA63B139B22514A08798E3404DD");
sb.append("EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245");
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/Rc4KeyMaker.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/Rc4KeyMaker.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/Rc4KeyMaker.java
index 8322bde..3e5cefa 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/Rc4KeyMaker.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/Rc4KeyMaker.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.kerby.kerberos.kerb.crypto.key;
@@ -23,7 +23,7 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.crypto.enc.EncryptProvider;
import org.apache.kerby.kerberos.kerb.crypto.util.Md4;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
public class Rc4KeyMaker extends AbstractKeyMaker {
@@ -39,14 +39,10 @@ public class Rc4KeyMaker extends AbstractKeyMaker {
throw new RuntimeException("Invalid param to str2Key");
}
- try {
- byte[] passwd = string.getBytes("UTF-16LE"); // to unicode
- MessageDigest md = new Md4();
- md.update(passwd);
- return md.digest();
- } catch (UnsupportedEncodingException e) {
- throw new KrbException("str2key failed", e);
- }
+ byte[] passwd = string.getBytes(StandardCharsets.UTF_16LE); // to unicode
+ MessageDigest md = new Md4();
+ md.update(passwd);
+ return md.digest();
}
@Override
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssNameElement.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssNameElement.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssNameElement.java
index 619b763..13be573 100644
--- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssNameElement.java
+++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssNameElement.java
@@ -27,7 +27,7 @@ import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSName;
import org.ietf.jgss.Oid;
import sun.security.jgss.spi.GSSNameSpi;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.Provider;
public class GssNameElement implements GSSNameSpi {
@@ -112,13 +112,7 @@ public class GssNameElement implements GSSNameSpi {
}
public byte[] export() throws GSSException {
- byte[] retVal;
- try {
- retVal = principalName.getName().getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new GSSException(GSSException.BAD_NAME, -1, e.getMessage());
- }
- return retVal;
+ return principalName.getName().getBytes(StandardCharsets.UTF_8);
}
public Oid getMechanism() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8053f03a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d7419e9..5b2be05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,6 +335,24 @@
<artifactId>maven-source-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <version>1.5.0</version>
+ <configuration>
+ <javaVersion>1.7</javaVersion>
+ </configuration>
+ <executions>
+ <execution>
+ <id>modernizer-check</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>modernizer</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>