import java.util.Date;
import java.util.List;
+import javax.net.ssl.SSLException;
+
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.Chapter;
import be.nikiroo.fanfix.data.MetaData;
* The available commands are given as arrays of objects (first item is the
* command, the rest are the arguments).
* <p>
- * All commands, including PING, will first return a random value to you that
- * you must hash with your key and return before processing the rest; if the
- * value not correct, the connection will be closed.
- * <p>
- * BTW: this system <b>is by no means secure</b>. It is just slightly
- * obfuscated, and operate on clear text (because Google decided not to support
- * anonymous SSL exchanges on Android, and the main use case for this server is
- * Android).
* <ul>
* <li>PING: will return PONG if the key is accepted</li>
* <li>GET_METADATA *: will return the metadata of all the stories in the
* @author niki
*/
public class RemoteLibraryServer extends ServerObject {
- private final String key;
-
/**
* Create a new remote server (will not be active until
* {@link RemoteLibraryServer#start()} is called).
* in case of I/O error
*/
public RemoteLibraryServer(String key, int port) throws IOException {
- super("Fanfix remote library", port, false);
- this.key = key;
+ super("Fanfix remote library", port, key);
setTraceHandler(Instance.getTraceHandler());
}
}
System.out.println(trace);
- // Authentication:
- String random = StringUtils.getMd5Hash(Double.toString(Math.random()));
- action.send(random);
- String answer = "" + action.rec();
-
- if (!answer.equals(RemoteLibrary.hashKey(key, random))) {
- System.out.println("Key rejected.");
- action.close();
- return null;
- }
- //
-
Object rep = doRequest(action, command, args);
String rec = StringUtils.formatNumber(action.getBytesReceived()) + "b";
@Override
protected void onError(Exception e) {
- getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ System.out.println("[Client connection refused (bad key)]");
+ } else {
+ getTraceHandler().error(e);
+ }
}
/**