Alert

From 6ce23e45d8e9abefae1627cecd6fd16e3f89e340 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Tue, 28 Jun 2016 00:07:42 +0200 Subject: [PATCH] upd: whitespace changes (formatting) .. to make all source files comply with committed formatter settings Change-Id: Iac4c831a1d71da206936727221d83c8e09d2cc7d --- src/org/cacert/gigi/Gigi.java | 5 +- src/org/cacert/gigi/Launcher.java | 10 +- src/org/cacert/gigi/crypto/SMIME.java | 6 +- .../cacert/gigi/dbObjects/DomainPingType.java | 2 +- src/org/cacert/gigi/email/EmailProvider.java | 3 +- .../pages/account/certs/CertificateAdd.java | 2 +- src/org/cacert/gigi/ping/SSLPinger.java | 28 +++--- src/org/cacert/gigi/util/DNSUtil.java | 6 +- src/org/cacert/gigi/util/PasswordHash.java | 3 +- .../crypto/test/CryptoTestUtil.java | 3 +- .../lambdaworks/crypto/test/PBKDFTest.java | 3 +- .../lambdaworks/crypto/test/SCryptTest.java | 25 ++--- .../crypto/test/SCryptUtilTest.java | 3 +- .../gigi/email/TestEmailProviderClass.java | 20 ++-- .../pages/account/TestCertificateAdd.java | 12 +-- .../pages/account/TestChangePassword.java | 21 +++-- tests/org/cacert/gigi/ping/TestSSL.java | 94 +++++++++---------- .../cacert/gigi/testUtils/ManagedTest.java | 10 +- util/org/cacert/gigi/util/FetchLocales.java | 2 +- 19 files changed, 133 insertions(+), 125 deletions(-) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 578c1353..5470c271 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -330,10 +330,9 @@ public final class Gigi extends HttpServlet { // it always String originHeader = req.getHeader("Origin"); if (originHeader != null // - && - !(originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getWwwHostNamePortSecure()) + "(/.*|)") || // + && !(originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getWwwHostNamePortSecure()) + "(/.*|)") || // originHeader.matches("^" + Pattern.quote("http://" + ServerConstants.getWwwHostNamePort()) + "(/.*|)") || // - originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getSecureHostNamePort()) + "(/.*|)"))) { + originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getSecureHostNamePort()) + "(/.*|)"))) { resp.setContentType("text/html; charset=utf-8"); resp.getWriter().println("AlertNo cross domain access allowed.
If you don't know why you're seeing this you may have been fished! Please change your password immediately!"); return; diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java index 763c21b4..7bf5bd11 100644 --- a/src/org/cacert/gigi/Launcher.java +++ b/src/org/cacert/gigi/Launcher.java @@ -137,7 +137,7 @@ public class Launcher { if (conf.getMainProps().getProperty("proxy", "false").equals("true")) { httpConfig.addCustomizer(new ExtendedForwarded()); s.setConnectors(new Connector[] { - ConnectorsLauncher.createConnector(conf, s, httpConfig, false) + ConnectorsLauncher.createConnector(conf, s, httpConfig, false) }); } else { HttpConfiguration httpsConfig = createHttpConfiguration(); @@ -286,11 +286,11 @@ public class Launcher { ContextHandler ch = generateGigiServletContext(webAppServlet); ch.setVirtualHosts(new String[] { - ServerConstants.getWwwHostName() + ServerConstants.getWwwHostName() }); ContextHandler chSecure = generateGigiServletContext(webAppServlet); chSecure.setVirtualHosts(new String[] { - ServerConstants.getSecureHostName() + ServerConstants.getSecureHostName() }); HandlerList hl = new HandlerList(); @@ -332,7 +332,7 @@ public class Launcher { ContextHandler ch = new ContextHandler(); ch.setHandler(rh); ch.setVirtualHosts(new String[] { - ServerConstants.getStaticHostName() + ServerConstants.getStaticHostName() }); return ch; @@ -355,7 +355,7 @@ public class Launcher { ServletContextHandler sch = new ServletContextHandler(); sch.addVirtualHosts(new String[] { - ServerConstants.getApiHostName() + ServerConstants.getApiHostName() }); sch.addServlet(new ServletHolder(new GigiAPI()), "/*"); return sch; diff --git a/src/org/cacert/gigi/crypto/SMIME.java b/src/org/cacert/gigi/crypto/SMIME.java index f37fbe8a..321a4df6 100644 --- a/src/org/cacert/gigi/crypto/SMIME.java +++ b/src/org/cacert/gigi/crypto/SMIME.java @@ -62,11 +62,11 @@ public class SMIME { // Create PKCS7 Signed data PKCS7 p7 = new PKCS7(new AlgorithmId[] { - new AlgorithmId(AlgorithmId.SHA_oid) + new AlgorithmId(AlgorithmId.SHA_oid) }, cInfo, new java.security.cert.X509Certificate[] { - c + c }, new SignerInfo[] { - sInfo + sInfo }); ByteArrayOutputStream bOut = new DerOutputStream(); diff --git a/src/org/cacert/gigi/dbObjects/DomainPingType.java b/src/org/cacert/gigi/dbObjects/DomainPingType.java index 8c3a0722..fcef3ce1 100644 --- a/src/org/cacert/gigi/dbObjects/DomainPingType.java +++ b/src/org/cacert/gigi/dbObjects/DomainPingType.java @@ -2,4 +2,4 @@ package org.cacert.gigi.dbObjects; public enum DomainPingType { EMAIL, DNS, HTTP, SSL; -} \ No newline at end of file +} diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java index a3203118..b66ba3f9 100644 --- a/src/org/cacert/gigi/email/EmailProvider.java +++ b/src/org/cacert/gigi/email/EmailProvider.java @@ -93,7 +93,8 @@ public abstract class EmailProvider { } else { return "Strange MX records."; } - try (Socket s = new Socket(host, 25); BufferedReader br0 = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8"));// + try (Socket s = new Socket(host, 25); + BufferedReader br0 = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8"));// PrintWriter pw0 = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"))) { BufferedReader br = br0; PrintWriter pw = pw0; diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java index fa3c1456..e37b930c 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java @@ -43,7 +43,7 @@ public class CertificateAdd extends Page { } resp.sendRedirect(Certificates.PATH + "/" + ser); } - f.output(resp.getWriter(), getLanguage(req), Collections.emptyMap()); + f.output(resp.getWriter(), getLanguage(req), Collections.emptyMap()); } diff --git a/src/org/cacert/gigi/ping/SSLPinger.java b/src/org/cacert/gigi/ping/SSLPinger.java index 505a6b34..71612920 100644 --- a/src/org/cacert/gigi/ping/SSLPinger.java +++ b/src/org/cacert/gigi/ping/SSLPinger.java @@ -168,24 +168,24 @@ public class SSLPinger extends DomainPinger { TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509"); tmf.init(truststore); sc.init(null, new TrustManager[] { - new X509TrustManager() { + new X509TrustManager() { - @Override - public java.security.cert.X509Certificate[] getAcceptedIssuers() { - return null; - } + @Override + public java.security.cert.X509Certificate[] getAcceptedIssuers() { + return null; + } - @Override - public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException { - java.security.cert.X509Certificate c = chain[0]; - if ( !c.getExtendedKeyUsage().contains("1.3.6.1.5.5.7.3.1")) { - throw new java.security.cert.CertificateException("Illegal EKU"); + @Override + public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException { + java.security.cert.X509Certificate c = chain[0]; + if ( !c.getExtendedKeyUsage().contains("1.3.6.1.5.5.7.3.1")) { + throw new java.security.cert.CertificateException("Illegal EKU"); + } } - } - @Override - public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException {} - } + @Override + public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException {} + } }, new SecureRandom()); } catch (KeyManagementException e) { e.printStackTrace(); diff --git a/src/org/cacert/gigi/util/DNSUtil.java b/src/org/cacert/gigi/util/DNSUtil.java index f1d5f9f3..31fb1d6e 100644 --- a/src/org/cacert/gigi/util/DNSUtil.java +++ b/src/org/cacert/gigi/util/DNSUtil.java @@ -25,7 +25,7 @@ public class DNSUtil { public static String[] getNSNames(String name) throws NamingException { Attributes dnsLookup = context.getAttributes(name, new String[] { - "NS" + "NS" }); return extractTextEntries(dnsLookup.get("NS")); } @@ -39,7 +39,7 @@ public class DNSUtil { try { Attributes dnsLookup = context.getAttributes(name, new String[] { - "TXT" + "TXT" }); return extractTextEntries(dnsLookup.get("TXT")); } finally { @@ -61,7 +61,7 @@ public class DNSUtil { public static String[] getMXEntries(String domain) throws NamingException { Attributes dnsLookup = context.getAttributes(domain, new String[] { - "MX" + "MX" }); return extractTextEntries(dnsLookup.get("MX")); } diff --git a/src/org/cacert/gigi/util/PasswordHash.java b/src/org/cacert/gigi/util/PasswordHash.java index 4de92440..6d598e77 100644 --- a/src/org/cacert/gigi/util/PasswordHash.java +++ b/src/org/cacert/gigi/util/PasswordHash.java @@ -15,7 +15,8 @@ public class PasswordHash { * The password that should result in the given hash. * @param hash * The hash to verify the password against. - * @return

null, if the password was valid
hash, if the password is valid and the hash * doesn't need to be updated

asList(ekuOIDs))); diff --git a/tests/org/cacert/gigi/pages/account/TestChangePassword.java b/tests/org/cacert/gigi/pages/account/TestChangePassword.java index 89d318e6..96018426 100644 --- a/tests/org/cacert/gigi/pages/account/TestChangePassword.java +++ b/tests/org/cacert/gigi/pages/account/TestChangePassword.java @@ -34,9 +34,10 @@ public class TestChangePassword extends ClientTest { @Test public void testChangePasswordWeb() throws IOException { - String error = executeBasicWebInteraction(cookie, path, "oldpassword=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") // - + "&pword1=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")// - + "&pword2=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")); + String error = executeBasicWebInteraction(cookie, path, + "oldpassword=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") // + + "&pword1=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")// + + "&pword2=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")); assertNull(error); assertTrue(isLoggedin(login(u.getEmail(), TEST_PASSWORD + "v2"))); assertFalse(isLoggedin(login(u.getEmail(), TEST_PASSWORD))); @@ -45,9 +46,10 @@ public class TestChangePassword extends ClientTest { @Test public void testChangePasswordWebOldWrong() throws IOException { - String error = executeBasicWebInteraction(cookie, path, "oldpassword=a" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") // - + "&pword1=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")// - + "&pword2=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")); + String error = executeBasicWebInteraction(cookie, path, + "oldpassword=a" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") // + + "&pword1=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")// + + "&pword2=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")); assertNotNull(error); assertFalse(isLoggedin(login(u.getEmail(), TEST_PASSWORD + "v2"))); assertTrue(isLoggedin(login(u.getEmail(), TEST_PASSWORD))); @@ -56,9 +58,10 @@ public class TestChangePassword extends ClientTest { @Test public void testChangePasswordWebNewWrong() throws IOException { - String error = executeBasicWebInteraction(cookie, path, "oldpassword=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") // - + "&pword1=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")// - + "&pword2=a" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")); + String error = executeBasicWebInteraction(cookie, path, + "oldpassword=" + URLEncoder.encode(TEST_PASSWORD, "UTF-8") // + + "&pword1=" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")// + + "&pword2=a" + URLEncoder.encode(TEST_PASSWORD + "v2", "UTF-8")); assertNotNull(error); assertFalse(isLoggedin(login(u.getEmail(), TEST_PASSWORD + "v2"))); assertTrue(isLoggedin(login(u.getEmail(), TEST_PASSWORD))); diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java index ab41ca51..34c8d297 100644 --- a/tests/org/cacert/gigi/ping/TestSSL.java +++ b/tests/org/cacert/gigi/ping/TestSSL.java @@ -59,9 +59,9 @@ public class TestSSL extends PingTest { @Parameters(name = "self-signed = {0}") public static Iterable genParams() throws IOException { return Arrays.asList(new Object[] { - true + true }, new Object[] { - false + false }); } @@ -258,57 +258,57 @@ public class TestSSL extends PingTest { try { sc = SSLContext.getInstance("SSL"); sc.init(new KeyManager[] { - new X509KeyManager() { + new X509KeyManager() { + + @Override + public String[] getServerAliases(String keyType, Principal[] issuers) { + return new String[] { + "server" + }; + } + + @Override + public PrivateKey getPrivateKey(String alias) { + return priv; + } + + @Override + public String[] getClientAliases(String keyType, Principal[] issuers) { + throw new Error(); + } + + @Override + public X509Certificate[] getCertificateChain(String alias) { + return new X509Certificate[] { + cert + }; + } + + @Override + public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) { + throw new Error(); + } + + @Override + public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) { + return "server"; + } - @Override - public String[] getServerAliases(String keyType, Principal[] issuers) { - return new String[] { - "server" - }; } - - @Override - public PrivateKey getPrivateKey(String alias) { - return priv; - } - - @Override - public String[] getClientAliases(String keyType, Principal[] issuers) { - throw new Error(); - } - - @Override - public X509Certificate[] getCertificateChain(String alias) { - return new X509Certificate[] { - cert - }; - } - - @Override - public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) { - throw new Error(); - } - - @Override - public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) { - return "server"; - } - - } }, new TrustManager[] { - new X509TrustManager() { + new X509TrustManager() { - @Override - public X509Certificate[] getAcceptedIssuers() { - return null; - } + @Override + public X509Certificate[] getAcceptedIssuers() { + return null; + } - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {} + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {} - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {} - } + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {} + } }, new SecureRandom()); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 77418641..d5d3f8c6 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -393,14 +393,14 @@ public class ManagedTest extends ConfiguredTest { @Override public X509Certificate[] getCertificateChain(String arg0) { return new X509Certificate[] { - ce + ce }; } @Override public String[] getClientAliases(String arg0, Principal[] arg1) { return new String[] { - "client" + "client" }; } @@ -415,13 +415,13 @@ public class ManagedTest extends ConfiguredTest { @Override public String[] getServerAliases(String arg0, Principal[] arg1) { return new String[] { - "client" + "client" }; } }; SSLContext sc = SSLContext.getInstance("TLS"); sc.init(new KeyManager[] { - km + km }, null, null); if (connection instanceof HttpsURLConnection) { ((HttpsURLConnection) connection).setSSLSocketFactory(sc.getSocketFactory()); @@ -468,7 +468,7 @@ public class ManagedTest extends ConfiguredTest { uc.setDoOutput(true); OutputStream os = uc.getOutputStream(); os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" // - + query// + + query// ).getBytes("UTF-8")); os.flush(); return (HttpURLConnection) uc; diff --git a/util/org/cacert/gigi/util/FetchLocales.java b/util/org/cacert/gigi/util/FetchLocales.java index f3097af1..0b61dcca 100644 --- a/util/org/cacert/gigi/util/FetchLocales.java +++ b/util/org/cacert/gigi/util/FetchLocales.java @@ -33,7 +33,7 @@ public class FetchLocales { public static String PO_URL_TEMPLATE = "https://" + DOWNLOAD_SERVER + "/%/gigi/messages.po"; public static final String[] AUTO_LANGS = new String[] { - "de" + "de" }; public static void main(String[] args) throws IOException, ParserConfigurationException, TransformerException { -- 2.39.2