import java.io.OutputStreamWriter;
import java.net.Socket;
+import javax.net.ssl.SSLException;
+
import be.nikiroo.utils.CryptUtils;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.Exporter;
* Handler called when an unexpected error occurs in the code.
*
* @param e
- * the exception that occurred
+ * the exception that occurred, SSLException usually denotes a
+ * crypt error
*/
abstract protected void onError(Exception e);
out = new OutputStreamWriter(s.getOutputStream(), "UTF-8");
try {
if (server) {
- String line = readLine(in);
+ String line;
+ try {
+ line = readLine(in);
+ } catch (SSLException e) {
+ out.write("Unauthorized\n");
+ throw e;
+ }
+
if (line != null && line.startsWith("VERSION ")) {
// "VERSION client-version" (VERSION 1.0.0)
Version clientVersion = new Version(
*
* @throws IOException
* in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
*/
protected String sendString(String line) throws IOException {
synchronized (lock) {
*
* @throws IOException
* in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
*/
protected String recString() throws IOException {
synchronized (lock) {
}
}
+ /**
+ * Read a possibly encrypted line.
+ *
+ * @param in
+ * the stream to read from
+ * @return the unencrypted line
+ *
+ *
+ * @throws IOException
+ * in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
+ */
private String readLine(BufferedReader in) throws IOException {
String line = in.readLine();
if (line != null) {
return line;
}
+ /**
+ * Write a line, possible encrypted.
+ *
+ * @param out
+ * the stream to write to
+ * @param line
+ * the line to write
+ * @throws IOException
+ * in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
+ */
private void writeLine(OutputStreamWriter out, String line)
throws IOException {
if (crypt == null) {