format everything for readability and so the brackets all line up again. All whitespace changes.
This commit is contained in:
idk
@@ -1,5 +1,7 @@
|
|||||||
package net.i2p.router;
|
package net.i2p.router;
|
||||||
|
|
||||||
|
import static net.i2p.update.UpdateType.*;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.ServerSocket;
|
import java.net.ServerSocket;
|
||||||
@@ -8,24 +10,20 @@ import java.util.*;
|
|||||||
import java.util.logging.FileHandler;
|
import java.util.logging.FileHandler;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.logging.SimpleFormatter;
|
import java.util.logging.SimpleFormatter;
|
||||||
|
|
||||||
import net.i2p.crypto.*;
|
|
||||||
|
|
||||||
import net.i2p.app.ClientAppManager;
|
import net.i2p.app.ClientAppManager;
|
||||||
import net.i2p.router.RouterLaunch;
|
import net.i2p.crypto.*;
|
||||||
|
import net.i2p.i2pfirefox.*;
|
||||||
import net.i2p.router.Router;
|
import net.i2p.router.Router;
|
||||||
|
import net.i2p.router.RouterLaunch;
|
||||||
|
import net.i2p.update.*;
|
||||||
import net.i2p.update.UpdateManager;
|
import net.i2p.update.UpdateManager;
|
||||||
import net.i2p.update.UpdatePostProcessor;
|
import net.i2p.update.UpdatePostProcessor;
|
||||||
import net.i2p.util.SystemVersion;
|
import net.i2p.util.SystemVersion;
|
||||||
import net.i2p.update.*;
|
|
||||||
import net.i2p.i2pfirefox.*;
|
|
||||||
|
|
||||||
import static net.i2p.update.UpdateType.*;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Launches a router from %PROGRAMFILES%/I2P using configuration data in
|
* Launches a router from %PROGRAMFILES%/I2P using configuration data in
|
||||||
* %LOCALAPPDATA%/I2P.. Uses Java 9 APIs.
|
* %LOCALAPPDATA%/I2P.. Uses Java 9 APIs.
|
||||||
*
|
*
|
||||||
* Sets the following properties:
|
* Sets the following properties:
|
||||||
* i2p.dir.base - this points to the (read-only) resources inside the bundle
|
* i2p.dir.base - this points to the (read-only) resources inside the bundle
|
||||||
* i2p.dir.config this points to the (read-write) config directory in local
|
* i2p.dir.config this points to the (read-write) config directory in local
|
||||||
@@ -33,213 +31,230 @@ import static net.i2p.update.UpdateType.*;
|
|||||||
* router.pid - the pid of the java process.
|
* router.pid - the pid of the java process.
|
||||||
*/
|
*/
|
||||||
public class WinLauncher {
|
public class WinLauncher {
|
||||||
static Logger logger = Logger.getLogger("launcherlog");
|
static Logger logger = Logger.getLogger("launcherlog");
|
||||||
static FileHandler fh;
|
static FileHandler fh;
|
||||||
|
|
||||||
public static void main(String[] args) throws Exception {
|
public static void main(String[] args) throws Exception {
|
||||||
try {
|
try {
|
||||||
// This block configure the logger with handler and formatter
|
// This block configure the logger with handler and formatter
|
||||||
fh = new FileHandler(logFile().toString());
|
fh = new FileHandler(logFile().toString());
|
||||||
logger.addHandler(fh);
|
logger.addHandler(fh);
|
||||||
SimpleFormatter formatter = new SimpleFormatter();
|
SimpleFormatter formatter = new SimpleFormatter();
|
||||||
fh.setFormatter(formatter);
|
fh.setFormatter(formatter);
|
||||||
// the following statement is used to log any messages
|
// the following statement is used to log any messages
|
||||||
logger.info("My first log");
|
logger.info("My first log");
|
||||||
} catch (SecurityException e) {
|
} catch (SecurityException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
|
||||||
boolean privateBrowsing = false;
|
|
||||||
boolean usabilityMode = false;
|
|
||||||
boolean chromiumFirst = false;
|
|
||||||
|
|
||||||
if (args != null && args.length > 0) {
|
|
||||||
logger.info("checking for private browsing");
|
|
||||||
if (args[0].equals("-private")) {
|
|
||||||
privateBrowsing = true;
|
|
||||||
logger.info("Private browsing is true, profile will be discarded at end of session.");
|
|
||||||
}
|
|
||||||
if (args[0].equals("-chromium")) {
|
|
||||||
chromiumFirst = true;
|
|
||||||
logger.info("Chromium will be selected before Firefox.");
|
|
||||||
}
|
|
||||||
if (args[0].equals("-usability")) {
|
|
||||||
usabilityMode = true;
|
|
||||||
logger.info("Usability mode is true, using alternate extensions loadout.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
File programs = selectProgramFile();
|
|
||||||
if (!programs.exists())
|
|
||||||
programs.mkdirs();
|
|
||||||
else if (!programs.isDirectory()) {
|
|
||||||
logger.warning(programs + " exists but is not a directory. Please get it out of the way");
|
|
||||||
System.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
File home = selectHome();
|
|
||||||
if (!home.exists())
|
|
||||||
home.mkdirs();
|
|
||||||
else if (!home.isDirectory()) {
|
|
||||||
logger.warning(home + " exists but is not a directory. Please get it out of the way");
|
|
||||||
System.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i2pIsRunning()) {
|
|
||||||
logger.warning("I2P is already running");
|
|
||||||
I2PBrowser i2pBrowser = new I2PBrowser();
|
|
||||||
i2pBrowser.usability = usabilityMode;
|
|
||||||
i2pBrowser.chromiumFirst = chromiumFirst;
|
|
||||||
System.out.println("I2PBrowser");
|
|
||||||
i2pBrowser.launch(privateBrowsing);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
System.setProperty("i2p.dir.base", programs.getAbsolutePath());
|
|
||||||
System.setProperty("i2p.dir.config", home.getAbsolutePath());
|
|
||||||
System.setProperty("router.pid", String.valueOf(ProcessHandle.current().pid()));
|
|
||||||
logger.info("\t" + System.getProperty("i2p.dir.base") + "\n\t" + System.getProperty("i2p.dir.config")
|
|
||||||
+ "\n\t" + System.getProperty("router.pid"));
|
|
||||||
System.setProperty("user.dir", programs.getAbsolutePath());
|
|
||||||
|
|
||||||
// wupp.i2pRouter = new Router(System.getProperties());
|
|
||||||
logger.info("Router is configured");
|
|
||||||
|
|
||||||
Thread registrationThread = new Thread(REGISTER_UPP);
|
|
||||||
registrationThread.setName("UPP Registration");
|
|
||||||
registrationThread.setDaemon(true);
|
|
||||||
registrationThread.start();
|
|
||||||
|
|
||||||
// wupp.i2pRouter.runRouter();
|
|
||||||
RouterLaunch.main(args);
|
|
||||||
}
|
}
|
||||||
|
boolean privateBrowsing = false;
|
||||||
|
boolean usabilityMode = false;
|
||||||
|
boolean chromiumFirst = false;
|
||||||
|
|
||||||
// see https://stackoverflow.com/questions/434718/sockets-discover-port-availability-using-java
|
if (args != null) {
|
||||||
public static boolean isAvailable(int portNr) {
|
if (args.length > 0) {
|
||||||
boolean portFree;
|
logger.info("checking for private browsing");
|
||||||
try (var ignored = new ServerSocket(portNr)) {
|
if (args[0].equals("-private")) {
|
||||||
portFree = true;
|
privateBrowsing = true;
|
||||||
} catch (IOException e) {
|
logger.info(
|
||||||
portFree = false;
|
"Private browsing is true, profile will be discarded at end of session.");
|
||||||
|
}
|
||||||
|
if (args[0].equals("-chromium")) {
|
||||||
|
chromiumFirst = true;
|
||||||
|
logger.info("Chromium will be selected before Firefox.");
|
||||||
|
}
|
||||||
|
if (args[0].equals("-usability")) {
|
||||||
|
usabilityMode = true;
|
||||||
|
logger.info(
|
||||||
|
"Usability mode is true, using alternate extensions loadout.");
|
||||||
}
|
}
|
||||||
return portFree;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean i2pIsRunning() {
|
|
||||||
sleep(2000);
|
|
||||||
// check if there's something listening on port 7657(Router Console)
|
|
||||||
if (!isAvailable(7657)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
// check if there's something listening on port 7654(I2CP)
|
|
||||||
if (!isAvailable(7654)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
// check for the existence of router.ping file, if it's less then 2 minutes old,
|
|
||||||
// exit
|
|
||||||
File home = selectHome();
|
|
||||||
File ping = new File(home, "router.ping");
|
|
||||||
if (ping.exists()) {
|
|
||||||
long diff = System.currentTimeMillis() - ping.lastModified();
|
|
||||||
if (diff < 60 * 1000) {
|
|
||||||
logger.info("router.ping exists and is less than 1 minute old, I2P appears to be running already.");
|
|
||||||
logger.info("If I2P is not running, wait 60 seconds and try again.");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Runnable REGISTER_UPP = () -> {
|
File programs = selectProgramFile();
|
||||||
|
if (!programs.exists())
|
||||||
// first wait for the RouterContext to appear
|
programs.mkdirs();
|
||||||
RouterContext ctx;
|
else if (!programs.isDirectory()) {
|
||||||
while ((ctx = (RouterContext) RouterContext.getCurrentContext()) == null) {
|
logger.warning(
|
||||||
sleep(1000);
|
programs +
|
||||||
}
|
" exists but is not a directory. Please get it out of the way");
|
||||||
|
System.exit(1);
|
||||||
// then wait for the update manager
|
|
||||||
|
|
||||||
ClientAppManager cam;
|
|
||||||
while ((cam = ctx.clientAppManager()) == null) {
|
|
||||||
sleep(1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
UpdateManager um;
|
|
||||||
while ((um = (UpdateManager) cam.getRegisteredApp(UpdateManager.APP_NAME)) == null) {
|
|
||||||
sleep(1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor(ctx);
|
|
||||||
um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE);
|
|
||||||
um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
|
|
||||||
};
|
|
||||||
|
|
||||||
private static void sleep(int millis) {
|
|
||||||
try {
|
|
||||||
Thread.sleep(millis);
|
|
||||||
} catch (InterruptedException bad) {
|
|
||||||
bad.printStackTrace();
|
|
||||||
throw new RuntimeException(bad);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static File selectHome() { // throws Exception {
|
File home = selectHome();
|
||||||
String path_override = System.getenv("I2P_CONFIG");
|
if (!home.exists())
|
||||||
if (path_override != null) {
|
home.mkdirs();
|
||||||
File path = new File(path_override);
|
else if (!home.isDirectory()) {
|
||||||
if (path != null && path.exists()) {
|
logger.warning(
|
||||||
if (path.isDirectory())
|
home +
|
||||||
return path.getAbsoluteFile();
|
" exists but is not a directory. Please get it out of the way");
|
||||||
else
|
System.exit(1);
|
||||||
throw new RuntimeException("I2P_CONFIG is not a directory: " + path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (SystemVersion.isWindows()) {
|
|
||||||
File home = new File(System.getProperty("user.home"));
|
|
||||||
File appData = new File(home, "AppData");
|
|
||||||
File local = new File(appData, "Local");
|
|
||||||
File i2p;
|
|
||||||
i2p = new File(local, "I2P");
|
|
||||||
logger.info("Windows jpackage wrapper started, using: " + i2p + " as base config");
|
|
||||||
return i2p.getAbsoluteFile();
|
|
||||||
} else {
|
|
||||||
File jrehome = new File(System.getProperty("java.home"));
|
|
||||||
File programs = new File(jrehome.getParentFile().getParentFile(), ".i2p");
|
|
||||||
logger.info("Linux portable jpackage wrapper started, using: " + programs + " as base config");
|
|
||||||
return programs.getAbsoluteFile();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static File selectProgramFile() {
|
if (i2pIsRunning()) {
|
||||||
String path_override = System.getenv("I2P");
|
logger.warning("I2P is already running");
|
||||||
if (path_override != null) {
|
I2PBrowser i2pBrowser = new I2PBrowser();
|
||||||
File path = new File(path_override);
|
i2pBrowser.usability = usabilityMode;
|
||||||
if (path.exists()) {
|
i2pBrowser.chromiumFirst = chromiumFirst;
|
||||||
if (path.isDirectory())
|
System.out.println("I2PBrowser");
|
||||||
return path.getAbsoluteFile();
|
i2pBrowser.launch(privateBrowsing);
|
||||||
else
|
return;
|
||||||
throw new RuntimeException("I2P is not a directory: " + path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (SystemVersion.isWindows()) {
|
|
||||||
File jrehome = new File(System.getProperty("java.home"));
|
|
||||||
File programs = jrehome.getParentFile();
|
|
||||||
logger.info("Windows portable jpackage wrapper found, using: " + programs + " as working config");
|
|
||||||
return programs.getAbsoluteFile();
|
|
||||||
} else {
|
|
||||||
File jrehome = new File(System.getProperty("java.home"));
|
|
||||||
File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
|
|
||||||
logger.info("Linux portable jpackage wrapper found, using: " + programs + " as working config");
|
|
||||||
return programs.getAbsoluteFile();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static File logFile() {
|
System.setProperty("i2p.dir.base", programs.getAbsolutePath());
|
||||||
File log = new File(selectProgramFile(), "log");
|
System.setProperty("i2p.dir.config", home.getAbsolutePath());
|
||||||
if (!log.exists())
|
System.setProperty("router.pid",
|
||||||
log.mkdirs();
|
String.valueOf(ProcessHandle.current().pid()));
|
||||||
return new File(log, "launcher.log");
|
logger.info("\t" + System.getProperty("i2p.dir.base") + "\n\t" +
|
||||||
|
System.getProperty("i2p.dir.config") + "\n\t" +
|
||||||
|
System.getProperty("router.pid"));
|
||||||
|
System.setProperty("user.dir", programs.getAbsolutePath());
|
||||||
|
|
||||||
|
// wupp.i2pRouter = new Router(System.getProperties());
|
||||||
|
logger.info("Router is configured");
|
||||||
|
|
||||||
|
Thread registrationThread = new Thread(REGISTER_UPP);
|
||||||
|
registrationThread.setName("UPP Registration");
|
||||||
|
registrationThread.setDaemon(true);
|
||||||
|
registrationThread.start();
|
||||||
|
|
||||||
|
// wupp.i2pRouter.runRouter();
|
||||||
|
RouterLaunch.main(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
// see
|
||||||
|
// https://stackoverflow.com/questions/434718/sockets-discover-port-availability-using-java
|
||||||
|
public static boolean isAvailable(int portNr) {
|
||||||
|
boolean portFree;
|
||||||
|
try (var ignored = new ServerSocket(portNr)) {
|
||||||
|
portFree = true;
|
||||||
|
} catch (IOException e) {
|
||||||
|
portFree = false;
|
||||||
}
|
}
|
||||||
|
return portFree;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean i2pIsRunning() {
|
||||||
|
sleep(2000);
|
||||||
|
// check if there's something listening on port 7657(Router Console)
|
||||||
|
if (!isAvailable(7657)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
// check if there's something listening on port 7654(I2CP)
|
||||||
|
if (!isAvailable(7654)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
// check for the existence of router.ping file, if it's less then 2 minutes
|
||||||
|
// old, exit
|
||||||
|
File home = selectHome();
|
||||||
|
File ping = new File(home, "router.ping");
|
||||||
|
if (ping.exists()) {
|
||||||
|
long diff = System.currentTimeMillis() - ping.lastModified();
|
||||||
|
if (diff < 60 * 1000) {
|
||||||
|
logger.info(
|
||||||
|
"router.ping exists and is less than 1 minute old, I2P appears to be running already.");
|
||||||
|
logger.info("If I2P is not running, wait 60 seconds and try again.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Runnable REGISTER_UPP = () -> {
|
||||||
|
|
||||||
|
// first wait for the RouterContext to appear
|
||||||
|
RouterContext ctx;
|
||||||
|
while ((ctx = (RouterContext)RouterContext.getCurrentContext()) == null) {
|
||||||
|
sleep(1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
// then wait for the update manager
|
||||||
|
|
||||||
|
ClientAppManager cam;
|
||||||
|
while ((cam = ctx.clientAppManager()) == null) {
|
||||||
|
sleep(1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdateManager um;
|
||||||
|
while ((um = (UpdateManager)cam.getRegisteredApp(UpdateManager.APP_NAME)) ==
|
||||||
|
null) {
|
||||||
|
sleep(1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor(ctx);
|
||||||
|
um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE);
|
||||||
|
um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
|
||||||
|
};
|
||||||
|
|
||||||
|
private static void sleep(int millis) {
|
||||||
|
try {
|
||||||
|
Thread.sleep(millis);
|
||||||
|
} catch (InterruptedException bad) {
|
||||||
|
bad.printStackTrace();
|
||||||
|
throw new RuntimeException(bad);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static File selectHome() { // throws Exception {
|
||||||
|
String path_override = System.getenv("I2P_CONFIG");
|
||||||
|
if (path_override != null) {
|
||||||
|
File path = new File(path_override);
|
||||||
|
if (path != null && path.exists()) {
|
||||||
|
if (path.isDirectory())
|
||||||
|
return path.getAbsoluteFile();
|
||||||
|
else
|
||||||
|
throw new RuntimeException("I2P_CONFIG is not a directory: " + path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (SystemVersion.isWindows()) {
|
||||||
|
File home = new File(System.getProperty("user.home"));
|
||||||
|
File appData = new File(home, "AppData");
|
||||||
|
File local = new File(appData, "Local");
|
||||||
|
File i2p;
|
||||||
|
i2p = new File(local, "I2P");
|
||||||
|
logger.info("Windows jpackage wrapper started, using: " + i2p +
|
||||||
|
" as base config");
|
||||||
|
return i2p.getAbsoluteFile();
|
||||||
|
} else {
|
||||||
|
File jrehome = new File(System.getProperty("java.home"));
|
||||||
|
File programs = new File(jrehome.getParentFile().getParentFile(), ".i2p");
|
||||||
|
logger.info("Linux portable jpackage wrapper started, using: " +
|
||||||
|
programs + " as base config");
|
||||||
|
return programs.getAbsoluteFile();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static File selectProgramFile() {
|
||||||
|
String path_override = System.getenv("I2P");
|
||||||
|
if (path_override != null) {
|
||||||
|
File path = new File(path_override);
|
||||||
|
if (path.exists()) {
|
||||||
|
if (path.isDirectory())
|
||||||
|
return path.getAbsoluteFile();
|
||||||
|
else
|
||||||
|
throw new RuntimeException("I2P is not a directory: " + path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (SystemVersion.isWindows()) {
|
||||||
|
File jrehome = new File(System.getProperty("java.home"));
|
||||||
|
File programs = jrehome.getParentFile();
|
||||||
|
logger.info("Windows portable jpackage wrapper found, using: " +
|
||||||
|
programs + " as working config");
|
||||||
|
return programs.getAbsoluteFile();
|
||||||
|
} else {
|
||||||
|
File jrehome = new File(System.getProperty("java.home"));
|
||||||
|
File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
|
||||||
|
logger.info("Linux portable jpackage wrapper found, using: " + programs +
|
||||||
|
" as working config");
|
||||||
|
return programs.getAbsoluteFile();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static File logFile() {
|
||||||
|
File log = new File(selectProgramFile(), "log");
|
||||||
|
if (!log.exists())
|
||||||
|
log.mkdirs();
|
||||||
|
return new File(log, "launcher.log");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user