From d3ea5d21225848e8aed4efe23e9705f0599a94d1 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 31 Jul 2014 14:44:52 +0000
Subject: [PATCH] drop ExecNamingService, moving to i2p.scripts
---
.../i2p/client/naming/ExecNamingService.java | 129 ------------------
1 file changed, 129 deletions(-)
delete mode 100644 core/java/src/net/i2p/client/naming/ExecNamingService.java
diff --git a/core/java/src/net/i2p/client/naming/ExecNamingService.java b/core/java/src/net/i2p/client/naming/ExecNamingService.java
deleted file mode 100644
index f6ac3ec7ae..0000000000
--- a/core/java/src/net/i2p/client/naming/ExecNamingService.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * By zzz 2008, released into the public domain
- * with no warranty of any kind, either expressed or implied.
- */
-package net.i2p.client.naming;
-
-import java.io.InputStream;
-import java.util.Locale;
-import java.util.Properties;
-
-import net.i2p.I2PAppContext;
-import net.i2p.data.Destination;
-
-/**
- * An interface to an external naming service program, with in-memory caching.
- * This can be used as a simple and flexible way to experiment with
- * alternative naming systems.
- *
- * The external command takes a hostname argument and must return (only) the
- * 516-byte Base64 destination, or hostname=dest, on stdout.
- * A trailing \n or \r\n is acceptable.
- * The command must exit 0 on success. Nonzero on failure is optional.
- *
- * The external command can do local and/or remote (via i2p or not) lookups.
- * No timeouts are implemented here - the author of the external program
- * must ensure that the program returns in a reasonable amount of time -
- * (15 sec max suggested)
- *
- * Can be used from MetaNamingService, (e.g. after HostsTxtNamingService),
- * or as the sole naming service.
- * Supports caching, b32, and b64.
- *
- * Sample chained config to put in configadvanced.jsp (restart required):
- *
- * i2p.naming.impl=net.i2p.client.naming.MetaNamingService
- * i2p.nameservicelist=net.i2p.client.naming.HostsTxtNamingService,net.i2p.client.naming.ExecNamingService
- * i2p.naming.exec.command=/usr/local/bin/i2presolve
- *
- * Sample unchained config to put in configadvanced.jsp (restart required):
- *
- * i2p.naming.impl=net.i2p.client.naming.ExecNamingService
- * i2p.naming.exec.command=/usr/local/bin/i2presolve
- *
- */
-public class ExecNamingService extends DummyNamingService {
-
- private final static String PROP_EXEC_CMD = "i2p.naming.exec.command";
- private final static String DEFAULT_EXEC_CMD = "/usr/local/bin/i2presolve";
- private final static String PROP_SHELL_CMD = "i2p.naming.exec.shell";
- private final static String DEFAULT_SHELL_CMD = "/bin/bash";
-
- /**
- * The naming service should only be constructed and accessed through the
- * application context. This constructor should only be used by the
- * appropriate application context itself.
- *
- */
- public ExecNamingService(I2PAppContext context) {
- super(context);
- // disable for now
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Destination lookup(String hostname, Properties lookupOptions, Properties storedOptions) {
- Destination d = super.lookup(hostname, null, null);
- if (d != null)
- return d;
- // Base32 failed?
- if (hostname.length() == BASE32_HASH_LENGTH + 8 && hostname.toLowerCase(Locale.US).endsWith(".b32.i2p"))
- return null;
-
- hostname = hostname.toLowerCase(Locale.US);
-
- // lookup
- String key = fetchAddr(hostname);
- if (key != null) {
- _log.error("Success: " + hostname);
- d = lookupBase64(key);
- putCache(hostname, d);
- return d;
- }
- return null;
- }
-
- // FIXME allow larger Dests for non-null Certs
- private static final int MAX_RESPONSE = DEST_SIZE + 68 + 10; // allow for hostname= and some trailing stuff
- private String fetchAddr(String hostname) {
- String[] commandArr = new String[3];
- commandArr[0] = _context.getProperty(PROP_SHELL_CMD, DEFAULT_SHELL_CMD);
- commandArr[1] = "-c";
- String command = _context.getProperty(PROP_EXEC_CMD, DEFAULT_EXEC_CMD) + " " + hostname;
- commandArr[2] = command;
-
- try {
- Process get = Runtime.getRuntime().exec(commandArr);
- get.waitFor();
- int exitValue = get.exitValue();
- if (exitValue != 0) {
- _log.error("Exit " + exitValue + " from " + commandArr[0] + " " + commandArr[1] + " \"" + command + "\"");
- return null;
- }
- InputStream is = get.getInputStream();
- byte[] input = new byte[MAX_RESPONSE];
- int count = is.read(input);
- is.close();
- if (count < DEST_SIZE) {
- _log.error("Short response: " + command);
- return null;
- }
- String key = new String(input);
- if (key.startsWith(hostname + "=")) // strip hostname=
- key = key.substring(hostname.length() + 1);
- key = key.substring(0, DEST_SIZE); // catch IndexOutOfBounds exception below
- if (!key.endsWith("AA")) {
- _log.error("Invalid key: " + command);
- return null;
- }
- if (key.replaceAll("[a-zA-Z0-9~-]", "").length() != 0) {
- _log.error("Invalid chars: " + command);
- return null;
- }
- return key;
- } catch (Throwable t) {
- _log.error("Error fetching the addr", t);
- }
- return null;
- }
-}
--
GitLab