diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java index db70482fab6..7bb44483b4c 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,10 +25,7 @@ package javax.security.auth.kerberos; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectStreamField; +import java.io.*; import java.security.BasicPermission; import java.security.Permission; import java.security.PermissionCollection; @@ -67,6 +64,7 @@ import java.util.concurrent.ConcurrentHashMap; public final class DelegationPermission extends BasicPermission implements java.io.Serializable { + @Serial private static final long serialVersionUID = 883133252142523922L; private transient String subordinate, service; @@ -177,12 +175,10 @@ public final class DelegationPermission extends BasicPermission return true; } - if (!(obj instanceof DelegationPermission)) { + if (!(obj instanceof DelegationPermission that)) { return false; } - DelegationPermission that = (DelegationPermission) obj; - return this.subordinate.equals(that.subordinate) && this.service.equals(that.service); } @@ -222,6 +218,7 @@ public final class DelegationPermission extends BasicPermission * @param s the {@code ObjectOutputStream} to which data is written * @throws IOException if an I/O error occurs */ + @Serial private synchronized void writeObject(java.io.ObjectOutputStream s) throws IOException { @@ -236,6 +233,7 @@ public final class DelegationPermission extends BasicPermission * @throws IOException if an I/O error occurs * @throws ClassNotFoundException if a serialized class cannot be loaded */ + @Serial private synchronized void readObject(java.io.ObjectInputStream s) throws IOException, ClassNotFoundException { @@ -309,6 +307,7 @@ final class KrbDelegationPermissionCollection extends PermissionCollection return perms.keys(); } + @Serial private static final long serialVersionUID = -3383936936589966948L; // Need to maintain serialization interoperability with earlier releases, @@ -318,6 +317,7 @@ final class KrbDelegationPermissionCollection extends PermissionCollection * @serialField permissions java.util.Vector * A list of DelegationPermission objects. */ + @Serial private static final ObjectStreamField[] serialPersistentFields = { new ObjectStreamField("permissions", Vector.class), }; @@ -329,6 +329,7 @@ final class KrbDelegationPermissionCollection extends PermissionCollection * Writes the contents of the perms field out as a Vector for * serialization compatibility with earlier releases. */ + @Serial private void writeObject(ObjectOutputStream out) throws IOException { // Don't call out.defaultWriteObject() @@ -343,6 +344,7 @@ final class KrbDelegationPermissionCollection extends PermissionCollection /* * Reads in a Vector of DelegationPermissions and saves them in the perms field. */ + @Serial @SuppressWarnings("unchecked") private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java index 492915f638e..08463c883ac 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/EncryptionKey.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ package javax.security.auth.kerberos; +import java.io.Serial; import java.util.Arrays; import java.util.Objects; import javax.crypto.SecretKey; @@ -48,6 +49,7 @@ import javax.security.auth.DestroyFailedException; */ public final class EncryptionKey implements SecretKey { + @Serial private static final long serialVersionUID = 9L; /** @@ -205,11 +207,10 @@ public final class EncryptionKey implements SecretKey { if (other == this) return true; - if (! (other instanceof EncryptionKey)) { + if (! (other instanceof EncryptionKey otherKey)) { return false; } - EncryptionKey otherKey = ((EncryptionKey) other); if (isDestroyed() || otherKey.isDestroyed()) { return false; } diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java index c39ae01d913..3045fd78180 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosCredMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -178,11 +178,10 @@ public final class KerberosCredMessage implements Destroyable { return true; } - if (! (other instanceof KerberosCredMessage)) { + if (! (other instanceof KerberosCredMessage otherMessage)) { return false; } - KerberosCredMessage otherMessage = ((KerberosCredMessage) other); if (isDestroyed() || otherMessage.isDestroyed()) { return false; } diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java index b5874f5637e..5c11c23d63a 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosKey.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ package javax.security.auth.kerberos; +import java.io.Serial; import java.util.Arrays; import javax.crypto.SecretKey; import javax.security.auth.DestroyFailedException; @@ -86,6 +87,7 @@ import javax.security.auth.DestroyFailedException; */ public class KerberosKey implements SecretKey { + @Serial private static final long serialVersionUID = -4625402278148246993L; /** @@ -108,7 +110,7 @@ public class KerberosKey implements SecretKey { * * @serial */ - private KeyImpl key; + private final KeyImpl key; private transient boolean destroyed = false; @@ -312,11 +314,10 @@ public class KerberosKey implements SecretKey { return true; } - if (! (other instanceof KerberosKey)) { + if (! (other instanceof KerberosKey otherKey)) { return false; } - KerberosKey otherKey = ((KerberosKey) other); if (isDestroyed() || otherKey.isDestroyed()) { return false; } @@ -328,15 +329,9 @@ public class KerberosKey implements SecretKey { } if (principal == null) { - if (otherKey.getPrincipal() != null) { - return false; - } + return otherKey.getPrincipal() == null; } else { - if (!principal.equals(otherKey.getPrincipal())) { - return false; - } + return principal.equals(otherKey.getPrincipal()); } - - return true; } } diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java index ed901e40864..a42d6625ee3 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,6 +41,7 @@ import sun.security.util.*; public final class KerberosPrincipal implements java.security.Principal, java.io.Serializable { + @Serial private static final long serialVersionUID = -7374788026156829911L; //name types @@ -190,7 +191,7 @@ public final class KerberosPrincipal public KerberosPrincipal(String name, int nameType) { - PrincipalName krb5Principal = null; + PrincipalName krb5Principal; try { // Appends the default realm if it is missing @@ -274,6 +275,7 @@ public final class KerberosPrincipal * Realm in their DER-encoded form as specified in Section 5.2.2 of * RFC4120. */ + @Serial private void writeObject(ObjectOutputStream oos) throws IOException { @@ -294,6 +296,7 @@ public final class KerberosPrincipal * @throws IOException if an I/O error occurs * @throws ClassNotFoundException if a serialized class cannot be loaded */ + @Serial private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { byte[] asn1EncPrincipal = (byte [])ois.readObject(); diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java index 9965e376a2d..8bf7fd167ba 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosTicket.java @@ -82,6 +82,7 @@ import sun.security.util.HexDumpEncoder; public class KerberosTicket implements Destroyable, Refreshable, java.io.Serializable { + @Serial private static final long serialVersionUID = 7395334370157380539L; // XXX Make these flag indices public @@ -311,9 +312,7 @@ public class KerberosTicket implements Destroyable, Refreshable, } else { this.flags = new boolean[NUM_FLAGS]; // Fill in whatever we have - for (int i = 0; i < flags.length; i++) { - this.flags[i] = flags[i]; - } + System.arraycopy(flags, 0, this.flags, 0, flags.length); } } else { this.flags = new boolean[NUM_FLAGS]; @@ -400,7 +399,7 @@ public class KerberosTicket implements Destroyable, Refreshable, * or destroyed. */ public final boolean isForwardable() { - return flags == null? false: flags[FORWARDABLE_TICKET_FLAG]; + return flags != null && flags[FORWARDABLE_TICKET_FLAG]; } /** @@ -412,7 +411,7 @@ public class KerberosTicket implements Destroyable, Refreshable, * or false otherwise or destroyed. */ public final boolean isForwarded() { - return flags == null? false: flags[FORWARDED_TICKET_FLAG]; + return flags != null && flags[FORWARDED_TICKET_FLAG]; } /** @@ -422,7 +421,7 @@ public class KerberosTicket implements Destroyable, Refreshable, * or destroyed. */ public final boolean isProxiable() { - return flags == null? false: flags[PROXIABLE_TICKET_FLAG]; + return flags != null && flags[PROXIABLE_TICKET_FLAG]; } /** @@ -432,7 +431,7 @@ public class KerberosTicket implements Destroyable, Refreshable, * a proxy-ticket or destroyed. */ public final boolean isProxy() { - return flags == null? false: flags[PROXY_TICKET_FLAG]; + return flags != null && flags[PROXY_TICKET_FLAG]; } @@ -443,7 +442,7 @@ public class KerberosTicket implements Destroyable, Refreshable, * or destroyed. */ public final boolean isPostdated() { - return flags == null? false: flags[POSTDATED_TICKET_FLAG]; + return flags != null && flags[POSTDATED_TICKET_FLAG]; } /** @@ -455,7 +454,7 @@ public class KerberosTicket implements Destroyable, Refreshable, * or destroyed. */ public final boolean isRenewable() { - return flags == null? false: flags[RENEWABLE_TICKET_FLAG]; + return flags != null && flags[RENEWABLE_TICKET_FLAG]; } /** @@ -466,7 +465,7 @@ public class KerberosTicket implements Destroyable, Refreshable, * protocol, or false if not issued this way or destroyed. */ public final boolean isInitial() { - return flags == null? false: flags[INITIAL_TICKET_FLAG]; + return flags != null && flags[INITIAL_TICKET_FLAG]; } /** @@ -555,7 +554,7 @@ public class KerberosTicket implements Destroyable, Refreshable, * or destroyed. */ public boolean isCurrent() { - return endTime == null? false: (System.currentTimeMillis() <= endTime.getTime()); + return endTime != null && (System.currentTimeMillis() <= endTime.getTime()); } /** @@ -775,11 +774,10 @@ public class KerberosTicket implements Destroyable, Refreshable, return true; } - if (! (other instanceof KerberosTicket)) { + if (! (other instanceof KerberosTicket otherTicket)) { return false; } - KerberosTicket otherTicket = ((KerberosTicket) other); if (isDestroyed() || otherTicket.isDestroyed()) { return false; } @@ -826,11 +824,7 @@ public class KerberosTicket implements Destroyable, Refreshable, } } - if (!Objects.equals(proxy, otherTicket.proxy)) { - return false; - } - - return true; + return Objects.equals(proxy, otherTicket.proxy); } /** @@ -840,6 +834,7 @@ public class KerberosTicket implements Destroyable, Refreshable, * @throws IOException if an I/O error occurs * @throws ClassNotFoundException if a serialized class cannot be loaded */ + @Serial private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException { s.defaultReadObject(); diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java index 59c1a4458f8..46168cf8377 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,6 +49,7 @@ import sun.security.util.DerValue; */ class KeyImpl implements SecretKey, Destroyable, Serializable { + @Serial private static final long serialVersionUID = -7889313790214321193L; private transient byte[] keyBytes; @@ -189,6 +190,7 @@ class KeyImpl implements SecretKey, Destroyable, Serializable { * @throws IOException if an I/O error occurs * } */ + @Serial private void writeObject(ObjectOutputStream oos) throws IOException { if (destroyed) { @@ -209,6 +211,7 @@ class KeyImpl implements SecretKey, Destroyable, Serializable { * @throws IOException if an I/O error occurs * @throws ClassNotFoundException if a serialized class cannot be loaded */ + @Serial private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { try { @@ -247,20 +250,15 @@ class KeyImpl implements SecretKey, Destroyable, Serializable { if (other == this) return true; - if (! (other instanceof KeyImpl)) { + if (! (other instanceof KeyImpl otherKey)) { return false; } - KeyImpl otherKey = ((KeyImpl) other); if (isDestroyed() || otherKey.isDestroyed()) { return false; } - if(keyType != otherKey.getKeyType() || - !Arrays.equals(keyBytes, otherKey.getEncoded())) { - return false; - } - - return true; + return keyType == otherKey.getKeyType() && + Arrays.equals(keyBytes, otherKey.getEncoded()); } } diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java index 47368018c18..375006e7452 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KeyTab.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -349,11 +349,10 @@ public final class KeyTab { if (other == this) return true; - if (! (other instanceof KeyTab)) { + if (! (other instanceof KeyTab otherKtab)) { return false; } - KeyTab otherKtab = (KeyTab) other; return Objects.equals(otherKtab.princ, princ) && Objects.equals(otherKtab.file, file) && bound == otherKtab.bound; diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java index 556cada4a7e..d327625040b 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,10 +25,7 @@ package javax.security.auth.kerberos; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectStreamField; +import java.io.*; import java.security.Permission; import java.security.PermissionCollection; import java.util.*; @@ -38,7 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; * This class is used to protect Kerberos services and the * credentials necessary to access those services. There is a one to * one mapping of a service principal and the credentials necessary - * to access the service. Therefore granting access to a service + * to access the service. Therefore, granting access to a service * principal implicitly grants access to the credential necessary to * establish a security context with the service principal. This * applies regardless of whether the credentials are in a cache @@ -105,6 +102,7 @@ import java.util.concurrent.ConcurrentHashMap; public final class ServicePermission extends Permission implements java.io.Serializable { + @Serial private static final long serialVersionUID = -1227585031618624935L; /** @@ -186,7 +184,7 @@ public final class ServicePermission extends Permission * Checks if this Kerberos service permission object "implies" the * specified permission. *

- * More specifically, this method returns true if all of the following + * More specifically, this method returns true if all the following * are true (and returns false if any of them are not): *