import java.util.ArrayList;
import java.util.List;
+import javax.net.ssl.SSLException;
+
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.utils.Image;
import be.nikiroo.utils.Progress;
-import be.nikiroo.utils.StringUtils;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.server.ConnectActionClientObject;
private String host;
private int port;
private final String key;
+ private final String subkey;
+
+ // informative only (server will make the actual checks)
+ private boolean rw;
+
+ // TODO: error handling is not up to par!
/**
* Create a {@link RemoteLibrary} linked to the given server.
+ * <p>
+ * Note that the key is structured:
+ * <tt><b><i>xxx</i></b>(|<b><i>yyy</i></b>|<b>wl</b>)(|<b>rw</b>)</tt>
+ * <p>
+ * Note that anything before the first pipe (<tt>|</tt>) character is
+ * considered to be the encryption key, anything after that character is
+ * called the subkey (including the other pipe characters and flags!).
+ * <p>
+ * This is important because the subkey (including the pipe characters and
+ * flags) must be present as-is in the server configuration file to be
+ * allowed.
+ * <ul>
+ * <li><b><i>xxx</i></b>: the encryption key used to communicate with the
+ * server</li>
+ * <li><b><i>yyy</i></b>: the secondary key</li>
+ * <li><b>rw</b>: flag to allow read and write access if it is not the
+ * default on this server</li>
+ * <li><b>wl</b>: flag to allow access to all the stories (bypassing the
+ * whitelist if it exists)</li>
+ * </ul>
+ *
+ * Some examples:
+ * <ul>
+ * <li><b>my_key</b>: normal connection, will take the default server
+ * options</li>
+ * <li><b>my_key|agzyzz|wl</b>: will ask to bypass the white list (if it
+ * exists)</li>
+ * <li><b>my_key|agzyzz|rw</b>: will ask read-write access (if the default
+ * is read-only)</li>
+ * <li><b>my_key|agzyzz|wl|rw</b>: will ask both read-write access and white
+ * list bypass</li>
+ * </ul>
*
* @param key
* the key that will allow us to exchange information with the
* the port to contact it on
*/
public RemoteLibrary(String key, String host, int port) {
- this.key = key;
+ int index = -1;
+ if (key != null) {
+ index = key.indexOf('|');
+ }
+
+ if (index >= 0) {
+ this.key = key.substring(0, index);
+ this.subkey = key.substring(index + 1);
+ } else {
+ this.key = key;
+ this.subkey = "";
+ }
+
this.host = host;
this.port = port;
}
@Override
public Status getStatus() {
+ Instance.getTraceHandler().trace("Getting remote lib status...");
+ Status status = getStatusDo();
+ Instance.getTraceHandler().trace("Remote lib status: " + status);
+ return status;
+ }
+
+ private boolean check() {
+ Status status = getStatusDo();
+ if (status != Status.READY) {
+ Instance.getTraceHandler().error("Remote lib not ready: " + status);
+ return false;
+ }
+
+ return true;
+ }
+
+ private Status getStatusDo() {
final Status[] result = new Status[1];
result[0] = Status.INVALID;
try {
- Instance.getTraceHandler().trace("Getting remote lib status...");
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- try {
- Object rep = sendCmd(this, new Object[] { "PING" });
-
- if ("PONG".equals(rep)) {
- result[0] = Status.READY;
- } else {
- result[0] = Status.UNAUTORIZED;
- }
- } catch (IllegalArgumentException e) {
- result[0] = Status.UNAUTORIZED;
+ Object rep = send(new Object[] { subkey, "PING" });
+
+ if ("r/w".equals(rep)) {
+ rw = true;
+ result[0] = Status.READY;
+ } else if ("r/o".equals(rep)) {
+ rw = false;
+ result[0] = Status.READY;
+ } else {
+ result[0] = Status.UNAUTHORIZED;
}
}
@Override
protected void onError(Exception e) {
- result[0] = Status.UNAVAILABLE;
+ // if (e instanceof SSLException) {
+ result[0] = Status.UNAUTHORIZED;
+ // } else {
+ // result[0] = Status.UNAVAILABLE;
+ // }
}
}.connect();
} catch (UnknownHostException e) {
result[0] = Status.UNAVAILABLE;
}
- Instance.getTraceHandler().trace("Remote lib status: " + result[0]);
return result[0];
}
@Override
public Image getCover(final String luid) {
+ if (!check()) {
+ return null;
+ }
+
final Image[] result = new Image[1];
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- Object rep = sendCmd(this,
- new Object[] { "GET_COVER", luid });
+ Object rep = send(new Object[] { subkey, "GET_COVER", luid });
result[0] = (Image) rep;
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
@Override
public Image getCustomSourceCover(final String source) {
+ if (!check()) {
+ return null;
+ }
+
return getCustomCover(source, "SOURCE");
}
@Override
public Image getCustomAuthorCover(final String author) {
+ if (!check()) {
+ return null;
+ }
+
return getCustomCover(author, "AUTHOR");
}
// type: "SOURCE" or "AUTHOR"
private Image getCustomCover(final String source, final String type) {
+ if (!check()) {
+ return null;
+ }
+
final Image[] result = new Image[1];
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- Object rep = sendCmd(this,
- new Object[] { "GET_CUSTOM_COVER", type, source });
+ Object rep = send(new Object[] { subkey,
+ "GET_CUSTOM_COVER", type, source });
result[0] = (Image) rep;
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
@Override
public synchronized Story getStory(final String luid, Progress pg) {
+ if (!check()) {
+ return null;
+ }
+
final Progress pgF = pg;
final Story[] result = new Story[1];
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
pg = new Progress();
}
- Object rep = sendCmd(this,
- new Object[] { "GET_STORY", luid });
+ Object rep = send(new Object[] { subkey, "GET_STORY", luid });
MetaData meta = null;
if (rep instanceof MetaData) {
}
List<Object> list = new ArrayList<Object>();
- for (Object obj = send(null); obj != null; obj = send(
- null)) {
+ for (Object obj = send(null); obj != null; obj = send(null)) {
list.add(obj);
pg.add(1);
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
@Override
public synchronized Story save(final Story story, final String luid,
Progress pg) throws IOException {
+ if (!check()) {
+ return null;
+ }
+
final String[] luidSaved = new String[1];
Progress pgSave = new Progress();
Progress pgRefresh = new Progress();
final Progress pgF = pgSave;
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
pg.setMinMax(0, (int) story.getMeta().getWords());
}
- sendCmd(this, new Object[] { "SAVE_STORY", luid });
+ send(new Object[] { subkey, "SAVE_STORY", luid });
List<Object> list = RemoteLibraryServer.breakStory(story);
for (Object obj : list) {
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
@Override
public synchronized void delete(final String luid) throws IOException {
- new ConnectActionClientObject(host, port, false) {
+ if (!check()) {
+ throw new IOException("Library not ready");
+ }
+
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- sendCmd(this, new Object[] { "DELETE_STORY", luid });
+ send(new Object[] { subkey, "DELETE_STORY", luid });
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
}
@Override
public void setSourceCover(final String source, final String luid) {
+ if (!check()) {
+ return;
+ }
+
setCover(source, luid, "SOURCE");
}
@Override
public void setAuthorCover(final String author, final String luid) {
+ if (!check()) {
+ return;
+ }
+
setCover(author, luid, "AUTHOR");
}
// type = "SOURCE" | "AUTHOR"
private void setCover(final String value, final String luid,
final String type) {
+ if (!check()) {
+ return;
+ }
+
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- sendCmd(this,
- new Object[] { "SET_COVER", type, value, luid });
+ send(new Object[] { subkey, "SET_COVER", type, value, luid });
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (IOException e) {
@Override
// Could work (more slowly) without it
public Story imprt(final URL url, Progress pg) throws IOException {
+ if (!check()) {
+ return null;
+ }
+
// Import the file locally if it is actually a file
if (url == null || url.getProtocol().equalsIgnoreCase("file")) {
return super.imprt(url, pg);
final String[] luid = new String[1];
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
- Object rep = sendCmd(this,
- new Object[] { "IMPORT", url.toString() });
+ Object rep = send(new Object[] { subkey, "IMPORT",
+ url.toString() });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (IOException e) {
protected synchronized void changeSTA(final String luid,
final String newSource, final String newTitle,
final String newAuthor, Progress pg) throws IOException {
+ if (!check()) {
+ return;
+ }
+
final Progress pgF = pg == null ? new Progress() : pg;
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
- Object rep = sendCmd(this, new Object[] { "CHANGE_STA",
+ Object rep = send(new Object[] { subkey, "CHANGE_STA",
luid, newSource, newTitle, newAuthor });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (IOException e) {
* Stop the server.
*/
public void exit() {
+ if (!check()) {
+ return;
+ }
+
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- sendCmd(this, new Object[] { "EXIT" });
+ send(new Object[] { subkey, "EXIT" });
}
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (IOException e) {
@Override
public synchronized MetaData getInfo(String luid) {
+ if (!check()) {
+ return null;
+ }
+
List<MetaData> metas = getMetasList(luid, null);
if (!metas.isEmpty()) {
return metas.get(0);
* @return the metas
*/
private List<MetaData> getMetasList(final String luid, Progress pg) {
+ if (!check()) {
+ return null;
+ }
+
final Progress pgF = pg;
final List<MetaData> metas = new ArrayList<MetaData>();
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
pg = new Progress();
}
-
- Object rep = sendCmd(this,
- new Object[] { "GET_METADATA", luid });
+ Object rep = send(new Object[] { subkey, "GET_METADATA",
+ luid });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@Override
protected void onError(Exception e) {
- Instance.getTraceHandler().error(e);
+ if (e instanceof SSLException) {
+ Instance.getTraceHandler().error(
+ "Connection refused (bad key)");
+ } else {
+ Instance.getTraceHandler().error(e);
+ }
}
}.connect();
} catch (Exception e) {
return metas;
}
-
- // IllegalArgumentException if key is bad
- private Object sendCmd(ConnectActionClientObject action, Object[] params)
- throws IOException, NoSuchFieldException, NoSuchMethodException,
- ClassNotFoundException {
- Object rep = action.send(params);
-
- String hash = hashKey(key, "" + rep);
- rep = action.send(hash);
- if (rep == null) {
- throw new java.lang.IllegalArgumentException();
- }
-
- return action.send(hash);
- }
-
- /**
- * Return a hash that corresponds to the given key and the given random
- * value.
- *
- * @param key
- * the key (the secret)
- *
- * @param random
- * the random value
- *
- * @return a hash that was computed using both
- */
- static String hashKey(String key, String random) {
- return StringUtils.getMd5Hash(key + " <==> " + random);
- }
}
git://git.nikiroo.be / fanfix.git / blobdiff