byte[] cacerts = Files.readAllBytes(Paths.get("config/cacerts.jks"));
byte[] keystore = Files.readAllBytes(Paths.get("config/keystore.pkcs12"));
- DevelLauncher.writeGigiConfig(dos, "changeit".getBytes(), "changeit".getBytes(), mainProps, cacerts, keystore);
+ DevelLauncher.writeGigiConfig(dos, "changeit".getBytes("UTF-8"), "changeit".getBytes("UTF-8"), mainProps, cacerts, keystore);
dos.flush();
InputStream oldin = System.in;
System.setIn(new ByteArrayInputStream(chunkConfig.toByteArray()));
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.Socket;
import java.security.GeneralSecurityException;
} else {
return "Strange MX records.";
}
- try (Socket s = new Socket(host, 25); BufferedReader br0 = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8")); PrintWriter pw0 = new PrintWriter(s.getOutputStream())) {
+ 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;
String line;
Socket smtp = new Socket("localhost", 25);
PrintWriter out = new PrintWriter(smtp.getOutputStream());
- BufferedReader in = new BufferedReader(new InputStreamReader(smtp.getInputStream()));
+ BufferedReader in = new BufferedReader(new InputStreamReader(smtp.getInputStream(), "UTF-8"));
readSMTPResponse(in, 220);
out.print("HELO www.cacert.org\r\n");
out.flush();
Socket s = sch.socket();
InputStream is = s.getInputStream();
OutputStream os = s.getOutputStream();
- os.write(("<stream:stream to=\"" + domain + "\" xmlns=\"jabber:" + (server ? "server" : "client") + "\"" + " xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">").getBytes());
+ os.write(("<stream:stream to=\"" + domain + "\" xmlns=\"jabber:" + (server ? "server" : "client") + "\"" + " xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">").getBytes("UTF-8"));
os.flush();
os.write("<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"/>".getBytes("UTF-8"));
os.flush();
authenticateClientCert(pk, ce, connection);
connection.setDoOutput(true);
OutputStream os = connection.getOutputStream();
- os.write(("csr=" + URLEncoder.encode(generatePEMCSR(kp, "CN=a b"), "UTF-8")).getBytes());
+ os.write(("csr=" + URLEncoder.encode(generatePEMCSR(kp, "CN=a b"), "UTF-8")).getBytes("UTF-8"));
os.flush();
assertEquals(connection.getResponseCode(), 200);
String cert = IOUtils.readURL(new InputStreamReader(connection.getInputStream(), "UTF-8"));
@Test
public void testParse() throws GeneralSecurityException, IOException {
- String spkac = IOUtils.readURL(new InputStreamReader(TestSPKAC.class.getResourceAsStream("sampleSPKAC.txt")));
+ String spkac = IOUtils.readURL(new InputStreamReader(TestSPKAC.class.getResourceAsStream("sampleSPKAC.txt"), "UTF-8"));
SPKAC parsed = new SPKAC(Base64.getDecoder().decode(spkac.replaceAll("[\r\n]", "")));
assertEquals("i am in the testcase", parsed.getChallenge());
RSAKey k = ((RSAKey) parsed.getPubkey());
@Test
public void testAddData() throws GeneralSecurityException, IOException {
- String spkac = IOUtils.readURL(new InputStreamReader(TestSPKAC.class.getResourceAsStream("sampleSPKAC.txt")));
+ String spkac = IOUtils.readURL(new InputStreamReader(TestSPKAC.class.getResourceAsStream("sampleSPKAC.txt"), "UTF-8"));
byte[] data = Base64.getDecoder().decode(spkac.replaceAll("[\r\n]", ""));
byte[] tampered = new byte[data.length + 1];
System.arraycopy(data, 0, tampered, 0, data.length);
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.Socket;
import java.security.GeneralSecurityException;
EmailProvider.getInstance().sendmail(succmail, subj, msg, "system@cacert.org", "system@cacert.org", "Testtarget", "Testsender", null, false);
Socket s = SSLSocketFactory.getDefault().createSocket(imap, 993);
- PrintWriter pw = new PrintWriter(s.getOutputStream(), true);
+ PrintWriter pw = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"), true);
BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream()));
pw.println("a001 login " + imapuser + " " + pass);
imapUntil(br, "a001");
huc.setRequestProperty("Cookie", cookie);
huc.setDoOutput(true);
OutputStream out = huc.getOutputStream();
- out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes());
- out.write(("&profile=client&CN=a+b&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes());
- out.write(("&hash_alg=SHA512&CCA=y").getBytes());
+ out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes("UTF-8"));
+ out.write(("&profile=client&CN=a+b&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes("UTF-8"));
+ out.write(("&hash_alg=SHA512&CCA=y").getBytes("UTF-8"));
URLConnection uc = authenticate(new URL(huc.getHeaderField("Location") + ".crt"));
String crt = IOUtils.readURL(new InputStreamReader(uc.getInputStream(), "UTF-8"));
huc.setRequestProperty("Cookie", cookie);
huc.setDoOutput(true);
OutputStream out = huc.getOutputStream();
- out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes());
- out.write(("&profile=client&CN=a+b&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes());
- out.write(("&hash_alg=SHA512&CCA=y&").getBytes());
- out.write(validity.getBytes());
+ out.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8")).getBytes("UTF-8"));
+ out.write(("&profile=client&CN=a+b&SANs=" + URLEncoder.encode("email:" + email + "\n", "UTF-8")).getBytes("UTF-8"));
+ out.write(("&hash_alg=SHA512&CCA=y&").getBytes("UTF-8"));
+ out.write(validity.getBytes("UTF-8"));
String certurl = huc.getHeaderField("Location");
if (certurl == null) {
String crt = IOUtils.readURL(new InputStreamReader(uc.getInputStream(), "UTF-8"));
CertificateFactory cf = CertificateFactory.getInstance("X.509");
- X509Certificate parsed = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(crt.getBytes()));
+ X509Certificate parsed = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(crt.getBytes("UTF-8")));
return parsed;
}
HttpURLConnection uc = (HttpURLConnection) ncert.openConnection();
uc.setRequestProperty("Cookie", cookie);
uc.setDoOutput(true);
- uc.getOutputStream().write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" + pem).getBytes());
+ uc.getOutputStream().write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" + pem).getBytes("UTF-8"));
uc.getOutputStream().flush();
return extractFormData(uc);
URLConnection uc = u.openConnection();
uc.setDoOutput(true);
uc.addRequestProperty("Cookie", cookie);
- uc.getOutputStream().write(("search&" + query).getBytes());
+ uc.getOutputStream().write(("search&" + query).getBytes("UTF-8"));
uc.getOutputStream().flush();
return IOUtils.readURL(uc);
public void testAssureFormNoCSRF() throws IOException {
// override csrf
HttpURLConnection uc = (HttpURLConnection) buildupAssureFormConnection(false);
- uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&CCAAgreed=1&assertion=1&points=10").getBytes());
+ uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&CCAAgreed=1&assertion=1&points=10").getBytes("UTF-8"));
uc.getOutputStream().flush();
assertEquals(500, uc.getResponseCode());
}
public void testAssureFormWrongCSRF() throws IOException {
// override csrf
HttpURLConnection uc = (HttpURLConnection) buildupAssureFormConnection(false);
- uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&CCAAgreed=1&assertion=1&points=10&csrf=aragc").getBytes());
+ uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&CCAAgreed=1&assertion=1&points=10&csrf=aragc").getBytes("UTF-8"));
uc.getOutputStream().flush();
assertEquals(500, uc.getResponseCode());
}
assertNull(executeBasicWebInteraction(assureeCookie, MyDetails.PATH, newName + "&" + newDob + "&processDetails", 0));
- uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&CCAAgreed=1&assertion=1&points=10").getBytes());
+ uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&CCAAgreed=1&assertion=1&points=10").getBytes("UTF-8"));
uc.getOutputStream().flush();
String error = fetchStartErrorMessage(IOUtils.readURL(uc));
assertTrue(error, !error.startsWith("</div>"));
private String getError(String query) throws MalformedURLException, IOException {
URLConnection uc = buildupAssureFormConnection(true);
- uc.getOutputStream().write((query).getBytes());
+ uc.getOutputStream().write((query).getBytes("UTF-8"));
uc.getOutputStream().flush();
String error = fetchStartErrorMessage(IOUtils.readURL(uc));
return error;
URLConnection uc = u.openConnection();
uc.addRequestProperty("Cookie", cookie);
uc.setDoOutput(true);
- uc.getOutputStream().write(("email=" + URLEncoder.encode(assureeM, "UTF-8") + "&day=1&month=1&year=1910&search").getBytes());
+ uc.getOutputStream().write(("email=" + URLEncoder.encode(assureeM, "UTF-8") + "&day=1&month=1&year=1910&search").getBytes("UTF-8"));
String csrf = getCSRF(uc);
uc = u.openConnection();
uc.addRequestProperty("Cookie", cookie);
uc.setDoOutput(true);
if (doCSRF) {
- uc.getOutputStream().write(("csrf=" + csrf + "&").getBytes());
+ uc.getOutputStream().write(("csrf=" + csrf + "&").getBytes("UTF-8"));
}
return uc;
}
String httpDom = getTestProps().getProperty("domain.http");
assumeNotNull(httpDom);
URL u = new URL("http://" + httpDom + "/cacert-" + token + ".txt");
- return IOUtils.readURL(new InputStreamReader(u.openStream())).trim();
+ return IOUtils.readURL(new InputStreamReader(u.openStream(), "UTF-8")).trim();
}
}
byte[] cacerts = Files.readAllBytes(Paths.get("config/cacerts.jks"));
byte[] keystore = Files.readAllBytes(Paths.get("config/keystore.pkcs12"));
- DevelLauncher.writeGigiConfig(toGigi, "changeit".getBytes(), "changeit".getBytes(), mainProps, cacerts, keystore);
+ DevelLauncher.writeGigiConfig(toGigi, "changeit".getBytes("UTF-8"), "changeit".getBytes("UTF-8"), mainProps, cacerts, keystore);
toGigi.flush();
- final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream()));
+ final BufferedReader br = new BufferedReader(new InputStreamReader(gigi.getErrorStream(), "UTF-8"));
String line;
while ((line = br.readLine()) != null && !line.contains("Server:main: Started")) {
}
String csrf = getCSRF(csrfConn);
uc.addRequestProperty("Cookie", headerField);
uc.setDoOutput(true);
- uc.getOutputStream().write((param + "&csrf=" + csrf).getBytes());
+ uc.getOutputStream().write((param + "&csrf=" + csrf).getBytes("UTF-8"));
String d = IOUtils.readURL(uc);
return d;
}
public static void grant(String email, Group g) throws IOException {
HttpURLConnection huc = (HttpURLConnection) new URL("https://" + getServerName() + Manager.PATH).openConnection();
huc.setDoOutput(true);
- huc.getOutputStream().write(("addpriv=y&priv=" + URLEncoder.encode(g.getDatabaseName(), "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8")).getBytes());
+ huc.getOutputStream().write(("addpriv=y&priv=" + URLEncoder.encode(g.getDatabaseName(), "UTF-8") + "&email=" + URLEncoder.encode(email, "UTF-8")).getBytes("UTF-8"));
assertEquals(200, huc.getResponseCode());
}
huc.setDoOutput(true);
OutputStream os = huc.getOutputStream();
String data = "username=" + URLEncoder.encode(email, "UTF-8") + "&password=" + URLEncoder.encode(pw, "UTF-8") + "&csrf=" + URLEncoder.encode(csrf, "UTF-8");
- os.write(data.getBytes());
+ os.write(data.getBytes("UTF-8"));
os.flush();
headerField = huc.getHeaderField("Set-Cookie");
if (headerField == null) {
OutputStream os = uc.getOutputStream();
os.write(("csrf=" + URLEncoder.encode(csrf, "UTF-8") + "&" //
+ query//
- ).getBytes());
+ ).getBytes("UTF-8"));
os.flush();
String error = fetchStartErrorMessage(IOUtils.readURL(uc));
return error;
URLConnection openConnection = u.openConnection();
openConnection.setRequestProperty("Cookie", cookie);
openConnection.setDoOutput(true);
- openConnection.getOutputStream().write(content.getBytes());
+ openConnection.getOutputStream().write(content.getBytes("UTF-8"));
openConnection.getHeaderField("Location");
String newcontent = IOUtils.readURL(cookie(u.openConnection(), cookie));
URLConnection uc = u.openConnection();
ManagedTest.cookie(uc, ManagedTest.stripCookie(csrfConn.getHeaderField("Set-Cookie")));
uc.setDoOutput(true);
- uc.getOutputStream().write((parts[1] + "&csrf=" + csrf).getBytes());
+ uc.getOutputStream().write((parts[1] + "&csrf=" + csrf).getBytes("UTF-8"));
uc.connect();
uc.getInputStream().close();
}
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
+import java.io.Reader;
import java.math.BigInteger;
import java.security.GeneralSecurityException;
import java.security.cert.CertificateFactory;
public static void main(String[] args) throws IOException, SQLException, InterruptedException {
Properties p = new Properties();
- try (FileReader reader = new FileReader("config/gigi.properties")) {
+ try (Reader reader = new InputStreamReader(new FileInputStream("config/gigi.properties"), "UTF-8")) {
p.load(reader);
}
DatabaseConnection.init(p);
continue;
}
} else {
- BufferedReader br = new BufferedReader(new InputStreamReader(p1.getErrorStream()));
+ BufferedReader br = new BufferedReader(new InputStreamReader(p1.getErrorStream(), "UTF-8"));
String s;
while ((s = br.readLine()) != null) {
System.out.println(s);
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
}
if (args.length == 0) {
Properties p = new Properties();
- try (FileReader reader = new FileReader("config/gigi.properties")) {
+ try (Reader reader = new InputStreamReader(new FileInputStream("config/gigi.properties"), "UTF-8")) {
p.load(reader);
}
args = new String[] {
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
import java.util.Scanner;
doc.appendChild(doc.createElement("translations"));
URL fetch = new URL(PO_URL_TEMPLATE.replace("%", lang));
URLConnection uc = fetch.openConnection();
- Scanner sc = new Scanner(uc.getInputStream());
+ Scanner sc = new Scanner(new InputStreamReader(uc.getInputStream(), "UTF-8"));
String s = readLine(sc);
StringBuffer contents = new StringBuffer();
String id = "";
projects / gigi.git / commitdiff