From a32971ceeaa46266cc99d72d4d40ef00513bb703 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Thu, 31 Mar 2022 17:02:27 +0200 Subject: [PATCH] More whitespace fixes Signed-off-by: Arjan Tijms --- .../src/main/java/org/jvnet/libpam/PAM.java | 51 ++++++++++++------- .../java/org/jvnet/libpam/PAMException.java | 6 +-- .../main/java/org/jvnet/libpam/UnixUser.java | 18 ++++--- 3 files changed, 47 insertions(+), 28 deletions(-) diff --git a/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAM.java b/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAM.java index 1eca1078f27..5fc65c8057b 100644 --- a/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAM.java +++ b/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAM.java @@ -16,20 +16,28 @@ package org.jvnet.libpam; -import org.jvnet.libpam.impl.PAMLibrary.*; -import static org.jvnet.libpam.impl.PAMLibrary.*; -import org.jvnet.libpam.impl.PAMLibrary.pam_conv.PamCallback; -import org.jvnet.libpam.impl.CLibrary.Passwd; -import static org.jvnet.libpam.impl.CLibrary.libc; -import com.sun.jna.Pointer; import static com.sun.jna.Native.POINTER_SIZE; import static java.util.logging.Level.FINE; +import static org.jvnet.libpam.impl.CLibrary.libc; +import static org.jvnet.libpam.impl.PAMLibrary.PAM_CONV_ERR; +import static org.jvnet.libpam.impl.PAMLibrary.PAM_PROMPT_ECHO_OFF; +import static org.jvnet.libpam.impl.PAMLibrary.PAM_SUCCESS; +import static org.jvnet.libpam.impl.PAMLibrary.PAM_USER; +import static org.jvnet.libpam.impl.PAMLibrary.libpam; -import com.sun.jna.ptr.PointerByReference; import java.util.Set; - import java.util.logging.Logger; +import org.jvnet.libpam.impl.CLibrary.Passwd; +import org.jvnet.libpam.impl.PAMLibrary.pam_conv; +import org.jvnet.libpam.impl.PAMLibrary.pam_conv.PamCallback; +import org.jvnet.libpam.impl.PAMLibrary.pam_handle_t; +import org.jvnet.libpam.impl.PAMLibrary.pam_message; +import org.jvnet.libpam.impl.PAMLibrary.pam_response; + +import com.sun.jna.Pointer; +import com.sun.jna.ptr.PointerByReference; + /** * PAM authenticator. * @@ -47,9 +55,9 @@ * @author Kohsuke Kawaguchi */ public class PAM { - + private static final Logger LOGGER = Logger.getLogger(PAM.class.getName()); - + private pam_handle_t pht; private int ret; @@ -65,11 +73,14 @@ public class PAM { */ public PAM(String serviceName) throws PAMException { pam_conv conv = new pam_conv(new PamCallback() { + @Override public int callback(int num_msg, Pointer msg, Pointer resp, Pointer pointer) { - if (LOGGER.isLoggable(FINE)) + if (LOGGER.isLoggable(FINE)) { LOGGER.fine("pam_conv num_msg=" + num_msg); - if (password == null) + } + if (password == null) { return PAM_CONV_ERR; + } // allocates pam_response[num_msg]. the caller will free this Pointer m = libc.calloc(pam_response.SIZE, num_msg); @@ -77,8 +88,9 @@ public int callback(int num_msg, Pointer msg, Pointer resp, Pointer pointer) { for (int i = 0; i < num_msg; i++) { pam_message pm = new pam_message(msg.getPointer(POINTER_SIZE * i)); - if (LOGGER.isLoggable(FINE)) + if (LOGGER.isLoggable(FINE)) { LOGGER.fine(pm.msg_style + ":" + pm.msg); + } if (pm.msg_style == PAM_PROMPT_ECHO_OFF) { pam_response r = new pam_response(m.share(pam_response.SIZE * i)); r.setResp(password); @@ -98,10 +110,11 @@ public int callback(int num_msg, Pointer msg, Pointer resp, Pointer pointer) { private void check(int ret, String msg) throws PAMException { this.ret = ret; if (ret != 0) { - if (pht != null) + if (pht != null) { throw new PAMException(msg + " : " + libpam.pam_strerror(pht, ret)); - else + } else { throw new PAMException(msg); + } } } @@ -124,8 +137,9 @@ public UnixUser authenticate(String username, String password) throws PAMExcepti check(libpam.pam_get_item(pht, PAM_USER, r), "pam_get_item failed"); String userName = r.getValue().getString(0); Passwd pwd = libc.getpwnam(userName); - if (pwd == null) + if (pwd == null) { throw new PAMException("Authentication succeeded but no user information is available"); + } return new UnixUser(userName, pwd); } finally { this.password = null; @@ -134,12 +148,13 @@ public UnixUser authenticate(String username, String password) throws PAMExcepti /** * Returns the groups a user belongs to - * + * * @param username * @return Set of group names * @throws PAMException * @deprecated Pointless and ugly convenience method. */ + @Deprecated public Set getGroupsOfUser(String username) throws PAMException { return new UnixUser(username).getGroups(); } @@ -169,5 +184,5 @@ protected void finalize() throws Throwable { dispose(); } - + } diff --git a/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAMException.java b/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAMException.java index 7af3d09a109..3e79b373703 100644 --- a/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAMException.java +++ b/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAMException.java @@ -22,9 +22,9 @@ * @author Kohsuke Kawaguchi */ public class PAMException extends Exception { - + private static final long serialVersionUID = 1L; - + public PAMException() { } @@ -40,5 +40,5 @@ public PAMException(Throwable cause) { super(cause); } - + } diff --git a/appserver/libpam4j/src/main/java/org/jvnet/libpam/UnixUser.java b/appserver/libpam4j/src/main/java/org/jvnet/libpam/UnixUser.java index ef161fa4c71..eaf5c7f494c 100644 --- a/appserver/libpam4j/src/main/java/org/jvnet/libpam/UnixUser.java +++ b/appserver/libpam4j/src/main/java/org/jvnet/libpam/UnixUser.java @@ -16,16 +16,18 @@ package org.jvnet.libpam; -import com.sun.jna.Memory; -import com.sun.jna.ptr.IntByReference; import static org.jvnet.libpam.impl.CLibrary.libc; -import org.jvnet.libpam.impl.CLibrary.Passwd; -import org.jvnet.libpam.impl.CLibrary.Group; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import org.jvnet.libpam.impl.CLibrary.Group; +import org.jvnet.libpam.impl.CLibrary.Passwd; + +import com.sun.jna.Memory; +import com.sun.jna.ptr.IntByReference; + /** * Represents an Unix user. Immutable. * @@ -53,19 +55,21 @@ public class UnixUser { if (libc.getgrouplist(userName, pwd.getPwGid(), m, pngroups) < 0) { // allocate a bigger memory m = new Memory(pngroups.getValue() * sz); - if (libc.getgrouplist(userName, pwd.getPwGid(), m, pngroups) < 0) + if (libc.getgrouplist(userName, pwd.getPwGid(), m, pngroups) < 0) { // shouldn't happen, but just in case. throw new PAMException("getgrouplist failed"); + } } ngroups = pngroups.getValue(); } catch (LinkageError e) { // some platform, notably Solaris, doesn't have the getgrouplist function ngroups = libc._getgroupsbymember(userName, m, ngroups, 0); - if (ngroups < 0) + if (ngroups < 0) { throw new PAMException("_getgroupsbymember failed"); + } } - groups = new HashSet(); + groups = new HashSet<>(); for (int i = 0; i < ngroups; i++) { int gid = m.getInt(i * sz); Group grp = libc.getgrgid(gid);