import java.io.InputStreamReader;
import java.io.OutputStream;
import java.lang.reflect.Field;
+import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
public static void main(String[] args) throws Exception {
Properties mainProps = new Properties();
- mainProps.load(new FileInputStream("config/gigi.properties"));
+ try (FileInputStream inStream = new FileInputStream("config/gigi.properties")) {
+ mainProps.load(inStream);
+ }
for (int i = 0; i < args.length; i++) {
if (args[i].equals("--port")) {
mainProps.setProperty("port", args[i + 1]);
}
i++;
}
+ try {
+ String targetPort = mainProps.getProperty("http.port");
+ String targetHost = mainProps.getProperty("name.www");
+ URL u = new URL("http://" + targetHost + ":" + targetPort + "/kill");
+ u.openStream();
+ } catch (IOException e) {
+ }
ByteArrayOutputStream chunkConfig = new ByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(chunkConfig);
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()));
- Launcher.main(args);
+ Launcher.boot();
addDevelPage();
System.setIn(oldin);
- BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+ BufferedReader br = new BufferedReader(new InputStreamReader(System.in, "UTF-8"));
System.out.println("Cacert-gigi system sucessfully started.");
System.out.println("Press enter to shutdown.");
br.readLine();
System.exit(0);
}
- private static void addDevelPage() {
+ public static void addDevelPage() {
try {
Field instF = Gigi.class.getDeclaredField("instance");
Field pageF = Gigi.class.getDeclaredField("pages");
instF.setAccessible(true);
pageF.setAccessible(true);
Object gigi = instF.get(null);
- HashMap<String, Page> pages = (HashMap<String, Page>) pageF.get(gigi);
- pages.put("/manage", new Page("Page-manger") {
+
+ // Check if we got a proper map (as much as we can tell)
+ Object pagesObj = pageF.get(gigi);
+ @SuppressWarnings("unchecked")
+ HashMap<String, Page> pages = pagesObj instanceof Map ? new HashMap<>((Map<String, Page>) pagesObj) : null;
+
+ pages.put("/manage", new Page("Page-manager") {
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
}
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ });
+
+ pages.put("/kill", new Page("Kill") {
+
+ @Override
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+ System.exit(0);
+ }
+
@Override
public boolean needsLogin() {
return false;
}
});
+
+ pageF.set(gigi, Collections.unmodifiableMap(pages));
} catch (ReflectiveOperationException e) {
e.printStackTrace();
}