servers);
+
+ void success(MispServer server);
+
+ void success(Server server);
+
+ void failure(String error);
+ }
+
+
+ private PreferenceManager preferenceManager;
+ private MispRestService mispRestService;
+
+ /**
+ * Initializes the rest client to communicate with a MISP instance.
+ *
+ * @param context needed to access the preferences for loading credentials
+ */
+ public MispRestClient(Context context) {
+ preferenceManager = PreferenceManager.getInstance(context);
+
+ String url = preferenceManager.getServerUrl();
+
+ Log.i(TAG, "URL: " + url);
+
+ try {
+ Retrofit retrofit = new Retrofit.Builder()
+ .baseUrl(url)
+ .addConverterFactory(GsonConverterFactory.create())
+ .client(getUnsafeOkHttpClient())
+ .build();
+
+ mispRestService = retrofit.create(MispRestService.class);
+ } catch (IllegalArgumentException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * NOTE: for development only!
+ *
+ * Accepts all certificates including self signed.
+ *
+ * @return {@link OkHttpClient} which accepts all certificates
+ */
+ private OkHttpClient getUnsafeOkHttpClient() {
+ try {
+ // Create a trust manager that does not validate certificate chains
+ final TrustManager[] trustAllCerts = new TrustManager[]{
+ new X509TrustManager() {
+ @SuppressLint("TrustAllX509TrustManager")
+ @Override
+ public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+ }
+
+ @SuppressLint("TrustAllX509TrustManager")
+ @Override
+ public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+ }
+
+ @Override
+ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+ return new java.security.cert.X509Certificate[]{};
+ }
+ }
+ };
+
+ // Install the all-trusting trust manager
+ final SSLContext sslContext = SSLContext.getInstance("SSL");
+ sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
+
+ // Create an ssl socket factory with our all-trusting manager
+ final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+
+ OkHttpClient.Builder builder = new OkHttpClient.Builder();
+ builder.sslSocketFactory(sslSocketFactory, (X509TrustManager)trustAllCerts[0]);
+ builder.hostnameVerifier(new HostnameVerifier() {
+ @Override
+ public boolean verify(String hostname, SSLSession session) {
+ return true;
+ }
+ });
+
+ // create logging interceptor
+ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
+ interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+ builder.addInterceptor(interceptor);
+
+ // create authorization interceptor
+ builder.addInterceptor(new Interceptor() {
+ @Override
+ public okhttp3.Response intercept(Chain chain) throws IOException {
+ Request.Builder ongoing = chain.request().newBuilder();
+ ongoing.addHeader("Accept", "application/json");
+ ongoing.addHeader("Content-Type", "application/json");
+ ongoing.addHeader("Authorization", preferenceManager.getAutomationKey());
+ return chain.proceed(ongoing.build());
+ }
+ });
+
+ return builder.build();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ // status routes
+
+ /**
+ * Check via pyMispRoute if server is available
+ *
+ * @param callback {@link AvailableCallback}
+ */
+ public void isAvailable(final AvailableCallback callback) {
+ Call call = mispRestService.pyMispVersion();
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (!response.isSuccessful()) {
+ if (response.code() == 403) {
+ callback.available();
+ return;
+ }
+
+ callback.unavailable(extractError(response));
+ } else {
+ callback.available();
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ callback.unavailable(extractError(t));
+ }
+ });
+ }
+
+ // user routes
+
+ /**
+ * Fetches information about the user that is associated with saved auth key.
+ *
+ * @param callback {@link UserCallback} wrapper to return user directly
+ */
+ public void getMyUser(final UserCallback callback) {
+ Call call = mispRestService.getMyUserInformation();
+
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (!response.isSuccessful()) {
+ callback.failure(extractError(response));
+ } else {
+ if (response.body() != null) {
+ callback.success(response.body().user);
+ } else {
+ callback.failure("response body was null");
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ t.printStackTrace();
+ callback.failure(t.getMessage());
+ }
+ });
+ }
+
+ /**
+ * Get an user with specific ID.
+ *
+ * @param userId user identifier
+ * @param callback {@link UserCallback} wrapper to return user directly
+ */
+ public void getUser(int userId, final UserCallback callback) {
+ Call call = mispRestService.getUser(userId);
+
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (!response.isSuccessful()) {
+ callback.failure(extractError(response));
+ } else {
+ if (response.body() != null) {
+ callback.success(response.body().user);
+ } else {
+ callback.failure("response body was null");
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ t.printStackTrace();
+ callback.failure(t.getMessage());
+ }
+ });
+ }
+
+ /**
+ * Add a given user to the MISP instance referenced by url in preferences.
+ *
+ * @param user user to add
+ * @param callback {@link UserCallback} wrapper to return the created user directly
+ */
+ public void addUser(User user, final UserCallback callback) {
+ Call call = mispRestService.addUser(user);
+
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (!response.isSuccessful()) {
+ callback.failure(extractError(response));
+ } else {
+ assert response.body() != null;
+ callback.success(response.body().user);
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ callback.failure(t.getMessage());
+ }
+ });
+ }
+
+
+ // organisation routes
+
+ /**
+ * Get an organisation by a given organisation id.
+ *
+ * @param orgId organisation identifier
+ * @param callback {@link OrganisationCallback} wrapper to return a organisation directly
+ */
+ public void getOrganisation(int orgId, final OrganisationCallback callback) {
+ Call call = mispRestService.getOrganisation(orgId);
+
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (!response.isSuccessful()) {
+ callback.failure(extractError(response));
+ } else {
+ if (response.body() != null) {
+ callback.success(response.body().organisation);
+ } else {
+ callback.failure("Response body was nul");
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ callback.failure(t.getMessage());
+ }
+ });
+ }
+
+ public Organisation[] getAllOrganisations() throws IOException {
+ Call> call = mispRestService.getAllOrganisations();
+ Response> response = call.execute();
+
+ List mispOrganisations = response.body();
+ Organisation[] organisations = new Organisation[mispOrganisations.size()];
+
+ for (int i = 0; i < mispOrganisations.size(); i++) {
+ organisations[i] = mispOrganisations.get(i).organisation;
+ }
+
+ return organisations;
+
+// call.enqueue(new Callback>() {
+// @Override
+// public void onResponse(Call> call, Response> response) {
+// if (!response.isSuccessful()) {
+// // TODO handle
+// return;
+// }
+//
+// List mispOrganisations = response.body();
+//
+// assert mispOrganisations != null;
+//
+// Organisation[] organisations = new Organisation[mispOrganisations.size()];
+//
+// for (int i = 0; i < mispOrganisations.size(); i++) {
+// organisations[i] = mispOrganisations.get(i).organisation;
+// }
+//
+// callback.success(organisations);
+// }
+//
+// @Override
+// public void onFailure(Call> call, Throwable t) {
+// callback.failure(extractError(t));
+// }
+// });
+ }
+
+ /**
+ * Add a given organisation to the MISP instance referenced by url in preferences.
+ *
+ * @param organisation organisation to add
+ * @param callback {@link OrganisationCallback} wrapper to return the created organisation directly
+ */
+ public void addOrganisation(Organisation organisation, final OrganisationCallback callback) {
+ Call call = mispRestService.addOrganisation(organisation);
+
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (!response.isSuccessful()) {
+ callback.failure(extractError(response));
+ } else {
+ assert response.body() != null;
+ callback.success(response.body().organisation);
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ callback.failure(t.getMessage());
+ }
+ });
+ }
+
+ // server routes
+
+ /**
+ * Get all servers on MISP instance.
+ *
+ * @param callback {@link OrganisationCallback} wrapper to return a list of servers directly
+ */
+ public void getServers(final ServerCallback callback) {
+ Call> call = mispRestService.getServers();
+
+ call.enqueue(new Callback>() {
+ @Override
+ public void onResponse(Call> call, Response> response) {
+ if (!response.isSuccessful()) {
+ callback.failure(extractError(response));
+ } else {
+ callback.success(response.body());
+ }
+ }
+
+ @Override
+ public void onFailure(Call> call, Throwable t) {
+ callback.failure(t.getMessage());
+ }
+ });
+ }
+
+ /**
+ * Add a server to the MISP instance
+ *
+ * @param server the server to create
+ * @param callback {@link ServerCallback} wrapper to return the created server directly
+ */
+ public void addServer(Server server, final ServerCallback callback) {
+ Call call = mispRestService.addServer(server);
+
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (!response.isSuccessful()) {
+ callback.failure(extractError(response));
+ } else {
+ callback.success(response.body());
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ callback.failure(t.getMessage());
+ }
+ });
+ }
+
+ // error parsing
+
+ /**
+ * Converts error {@link Response}s to human readable info.
+ * @param response erroneous response
+ * @param type of response
+ * @return human readable String that describes the error
+ */
+ private String extractError(Response response) {
+ switch (response.code()) {
+ // bad request (malformed)
+ case 400:
+ return "Bad request";
+
+ // unauthorized
+ case 401:
+ return "Unauthorized";
+
+ // forbidden
+ case 403:
+ try {
+ assert response.errorBody() != null;
+ JSONObject jsonError = new JSONObject(response.errorBody().string());
+
+ String name = jsonError.getString("name") + "\n";
+
+ if (name.startsWith("Authentication failed")) {
+ return "Authentication failed";
+ }
+
+ String reasons = "";
+ JSONObject errorReasons = jsonError.getJSONObject("errors");
+
+ Iterator errorKeys = errorReasons.keys();
+
+ while (errorKeys.hasNext()) {
+ reasons = reasons.concat(errorReasons.getString(errorKeys.next()) + "\n");
+ }
+
+ return name + reasons;
+ } catch (JSONException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return "Could not parse (403) error";
+
+ // not found
+ case 404:
+ return "Not found";
+ }
+
+ return "Unknown error";
+ }
+
+ /**
+ * Converts a {@link Throwable} to a human readable error message.
+ * @param t throwable
+ * @return human readable String that describes the error.
+ */
+ private String extractError(Throwable t) {
+
+ if (t.getCause() instanceof CertificateException) {
+ return "Trust anchor for certification path not found.\nSelf signed certificates are not supported.";
+ }
+
+ if (t instanceof SSLHandshakeException) {
+ return "SSL Handshake Error";
+ }
+
+ if (t instanceof NoRouteToHostException) {
+ return "Server is not available (no route to host)";
+ }
+
+ return t.getMessage();
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/lu/circl/mispbump/restful_client/MispRestService.java b/app/src/main/java/lu/circl/mispbump/restful_client/MispRestService.java
new file mode 100644
index 0000000..4eb6430
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/restful_client/MispRestService.java
@@ -0,0 +1,53 @@
+package lu.circl.mispbump.restful_client;
+
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+
+/**
+ * RetroFit2 interface for communication with misp instances
+ */
+public interface MispRestService {
+
+ // settings routes
+
+ @GET("servers/getPyMISPVersion")
+ Call pyMispVersion();
+
+ // user routes
+
+ @GET("users/view/me")
+ Call getMyUserInformation();
+
+ @GET("users/view/{value}")
+ Call getUser(@Path("value") int userId);
+
+ @POST("admin/users/add")
+ Call addUser(@Body User user);
+
+ // organisation routes
+
+ @GET("organisations/view/{value}")
+ Call getOrganisation(@Path("value") int orgId);
+
+ @GET("organisations")
+ Call> getAllOrganisations();
+
+ @POST("admin/organisations/add")
+ Call addOrganisation(@Body Organisation organisation);
+
+ // server routes
+
+ @GET("servers/index")
+ Call> getServers();
+
+// @POST("servers/add")
+// Call addServer(@Body MispServer server);
+
+ @POST("servers/add")
+ Call addServer(@Body Server server);
+}
\ No newline at end of file
diff --git a/app/src/main/java/lu/circl/mispbump/restful_client/MispServer.java b/app/src/main/java/lu/circl/mispbump/restful_client/MispServer.java
new file mode 100644
index 0000000..1c7b9b3
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/restful_client/MispServer.java
@@ -0,0 +1,30 @@
+package lu.circl.mispbump.restful_client;
+
+import java.util.List;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class MispServer {
+
+ public MispServer() {}
+
+ public MispServer(Server server, Organisation organisation, Organisation remoteOrganisation) {
+ this.server = server;
+ this.organisation = organisation;
+ this.remoteOrg = remoteOrganisation;
+ }
+
+ @SerializedName("Server")
+ @Expose
+ public Server server;
+ @SerializedName("Organisation")
+ @Expose
+ public Organisation organisation;
+ @SerializedName("RemoteOrg")
+ @Expose
+ public Organisation remoteOrg;
+ @SerializedName("User")
+ @Expose
+ public List user;
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/lu/circl/mispbump/restful_client/MispUser.java b/app/src/main/java/lu/circl/mispbump/restful_client/MispUser.java
new file mode 100644
index 0000000..4bcb275
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/restful_client/MispUser.java
@@ -0,0 +1,15 @@
+package lu.circl.mispbump.restful_client;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class MispUser {
+
+ @SerializedName("User")
+ @Expose
+ public User user;
+
+ public MispUser(User user) {
+ this.user = user;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/lu/circl/mispbump/restful_client/Organisation.java b/app/src/main/java/lu/circl/mispbump/restful_client/Organisation.java
new file mode 100644
index 0000000..f24bd59
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/restful_client/Organisation.java
@@ -0,0 +1,68 @@
+package lu.circl.mispbump.restful_client;
+
+/**
+ * Information gathered from Misp API about a organisation.
+ */
+public class Organisation {
+
+ public Integer id;
+ public String name;
+ public String date_created;
+ public String date_modified;
+ public String type;
+ public String nationality;
+ public String sector;
+ public String contacts;
+ public String description;
+ public Boolean local;
+ public String uuid;
+ public String restricted_to_domain;
+ public String created_by;
+ public Integer user_count;
+
+ public Organisation() {
+ }
+
+ public Organisation(String name) {
+ this.name = name;
+ }
+
+ public Organisation(String name, String description) {
+ this.name = name;
+ this.description = description;
+ }
+
+ public Organisation toSyncOrganisation() {
+ Organisation organisation = new Organisation();
+ organisation.local = true;
+ organisation.name = name;
+ organisation.uuid = uuid;
+ organisation.description = description;
+ organisation.nationality = nationality;
+ organisation.sector = sector;
+ organisation.type = "Sync organisation";
+ organisation.contacts = contacts;
+
+ return organisation;
+ }
+
+ @Override
+ public String toString() {
+ return "Organisation{" +
+ "id=" + id +
+ ", name='" + name + '\'' +
+ ", date_created='" + date_created + '\'' +
+ ", date_modified='" + date_modified + '\'' +
+ ", type='" + type + '\'' +
+ ", nationality='" + nationality + '\'' +
+ ", sector='" + sector + '\'' +
+ ", contacts='" + contacts + '\'' +
+ ", description='" + description + '\'' +
+ ", local=" + local +
+ ", uuid='" + uuid + '\'' +
+ ", restricted_to_domain='" + restricted_to_domain + '\'' +
+ ", created_by='" + created_by + '\'' +
+ ", user_count=" + user_count +
+ '}';
+ }
+}
diff --git a/app/src/main/java/lu/circl/mispbump/restful_client/Server.java b/app/src/main/java/lu/circl/mispbump/restful_client/Server.java
new file mode 100644
index 0000000..99ba9ad
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/restful_client/Server.java
@@ -0,0 +1,109 @@
+package lu.circl.mispbump.restful_client;
+
+import com.google.gson.annotations.SerializedName;
+
+public class Server {
+
+ public Server() {}
+
+ public Server(String name, String url, String authkey, Integer remote_org_id) {
+ this.name = name;
+ this.url = url;
+ this.authkey = authkey;
+ this.remote_org_id = remote_org_id;
+ }
+
+ @SerializedName("id")
+ public Integer id;
+
+ @SerializedName("name")
+ public String name;
+
+ @SerializedName("url")
+ public String url;
+
+ @SerializedName("authkey")
+ public String authkey;
+
+ @SerializedName("org_id")
+ public Integer org_id;
+
+ @SerializedName("push")
+ public Boolean push;
+
+ @SerializedName("pull")
+ public Boolean pull;
+
+ @SerializedName("lastpulledid")
+ public Object lastpulledid;
+
+ @SerializedName("lastpushedid")
+ public Object lastpushedid;
+
+ @SerializedName("organization")
+ public Object organization;
+
+ @SerializedName("remote_org_id")
+ public Integer remote_org_id;
+
+ @SerializedName("publish_without_email")
+ public Boolean publish_without_email = false;
+
+ @SerializedName("unpublish_event")
+ public Boolean unpublish_event;
+
+ @SerializedName("self_signed")
+ public Boolean self_signed = false;
+
+ @SerializedName("pull_rules")
+ public String pull_rules;
+
+ @SerializedName("push_rules")
+ public String push_rules;
+
+ @SerializedName("cert_file")
+ public Object cert_file;
+
+ @SerializedName("client_cert_file")
+ public Object client_cert_file;
+
+ @SerializedName("internal")
+ public Boolean internal;
+
+ @SerializedName("skip_proxy")
+ public Boolean skip_proxy = false;
+
+ @SerializedName("caching_enabled")
+ public Boolean caching_enabled;
+
+ @SerializedName("cache_timestamp")
+ public Boolean cache_timestamp;
+
+ @Override
+ public String toString() {
+ return "Server{" +
+ "id=" + id +
+ ", name='" + name + '\'' +
+ ", url='" + url + '\'' +
+ ", authkey='" + authkey + '\'' +
+ ", org_id=" + org_id +
+ ", push=" + push +
+ ", pull=" + pull +
+ ", lastpulledid=" + lastpulledid +
+ ", lastpushedid=" + lastpushedid +
+ ", organization=" + organization +
+ ", remote_org_id=" + remote_org_id +
+ ", publish_without_email=" + publish_without_email +
+ ", unpublish_event=" + unpublish_event +
+ ", self_signed=" + self_signed +
+ ", pull_rules='" + pull_rules + '\'' +
+ ", push_rules='" + push_rules + '\'' +
+ ", cert_file=" + cert_file +
+ ", client_cert_file=" + client_cert_file +
+ ", internal=" + internal +
+ ", skip_proxy=" + skip_proxy +
+ ", caching_enabled=" + caching_enabled +
+ ", cache_timestamp=" + cache_timestamp +
+ '}';
+ }
+}
diff --git a/app/src/main/java/lu/circl/mispbump/restful_client/User.java b/app/src/main/java/lu/circl/mispbump/restful_client/User.java
new file mode 100644
index 0000000..4535419
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/restful_client/User.java
@@ -0,0 +1,125 @@
+package lu.circl.mispbump.restful_client;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class User {
+
+ public static final int ROLE_ADMIN = 1;
+ public static final int ROLE_ORG_ADMIN = 2;
+ public static final int ROLE_USER = 3;
+ public static final int ROLE_PUBLISHER = 4;
+ public static final int ROLE_SYNC_USER = 5;
+ public static final int ROLE_READ_ONLY = 6;
+
+ public User() {
+ }
+
+ public User(Integer org_id, String email, Integer role_id) {
+ this.org_id = org_id;
+ this.email = email;
+ this.role_id = role_id;
+ }
+
+ public User(Integer org_id, String email, Integer role_id, String password) {
+ this.password = password;
+ this.org_id = org_id;
+ this.email = email;
+ this.role_id = role_id;
+ }
+
+ @SerializedName("id")
+ @Expose
+ public Integer id;
+ @SerializedName("password")
+ @Expose
+ public String password;
+ @SerializedName("org_id")
+ @Expose
+ public Integer org_id;
+ @SerializedName("email")
+ @Expose
+ public String email;
+ @SerializedName("autoalert")
+ @Expose
+ public Boolean autoalert;
+ @SerializedName("authkey")
+ @Expose
+ public String authkey;
+ @SerializedName("invited_by")
+ @Expose
+ public String invited_by;
+ @SerializedName("gpgkey")
+ @Expose
+ public Object gpgkey;
+ @SerializedName("certif_public")
+ @Expose
+ public String certif_public;
+ @SerializedName("nids_sid")
+ @Expose
+ public String nids_sid;
+ @SerializedName("termsaccepted")
+ @Expose
+ public Boolean termsaccepted;
+ @SerializedName("newsread")
+ @Expose
+ public String newsread;
+ @SerializedName("role_id")
+ @Expose
+ public Integer role_id;
+ @SerializedName("change_pw")
+ @Expose
+ public String change_pw;
+ @SerializedName("contactalert")
+ @Expose
+ public Boolean contactalert;
+ @SerializedName("disabled")
+ @Expose
+ public Boolean disabled;
+ @SerializedName("expiration")
+ @Expose
+ public Object expiration;
+ @SerializedName("current_login")
+ @Expose
+ public String current_login;
+ @SerializedName("last_login")
+ @Expose
+ public String last_login;
+ @SerializedName("force_logout")
+ @Expose
+ public Boolean force_logout;
+ @SerializedName("date_created")
+ @Expose
+ public Object date_created;
+ @SerializedName("date_modified")
+ @Expose
+ public String date_modified;
+
+ @Override
+ public String toString() {
+ return "User{" +
+ "id='" + id + '\'' +
+ ", password='" + password + '\'' +
+ ", org_id='" + org_id + '\'' +
+ ", email='" + email + '\'' +
+ ", autoalert=" + autoalert +
+ ", authkey='" + authkey + '\'' +
+ ", invited_by='" + invited_by + '\'' +
+ ", gpgkey=" + gpgkey +
+ ", certif_public='" + certif_public + '\'' +
+ ", nids_sid='" + nids_sid + '\'' +
+ ", termsaccepted=" + termsaccepted +
+ ", newsread='" + newsread + '\'' +
+ ", role_id='" + role_id + '\'' +
+ ", change_pw='" + change_pw + '\'' +
+ ", contactalert=" + contactalert +
+ ", disabled=" + disabled +
+ ", expiration=" + expiration +
+ ", current_login='" + current_login + '\'' +
+ ", last_login='" + last_login + '\'' +
+ ", force_logout=" + force_logout +
+ ", date_created=" + date_created +
+ ", date_modified='" + date_modified + '\'' +
+ '}';
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/lu/circl/mispbump/restful_client/Version.java b/app/src/main/java/lu/circl/mispbump/restful_client/Version.java
new file mode 100644
index 0000000..5ba921e
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/restful_client/Version.java
@@ -0,0 +1,10 @@
+package lu.circl.mispbump.restful_client;
+
+import com.google.gson.annotations.SerializedName;
+
+public class Version {
+
+ @SerializedName("version")
+ public String version;
+
+}
diff --git a/app/src/main/java/lu/circl/mispbump/security/DiffieHellman.java b/app/src/main/java/lu/circl/mispbump/security/DiffieHellman.java
new file mode 100644
index 0000000..407b057
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/security/DiffieHellman.java
@@ -0,0 +1,147 @@
+package lu.circl.mispbump.security;
+
+import android.util.Base64;
+
+import javax.crypto.*;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
+
+/**
+ * This class provides the functionality generate a shared secret key.
+ * Furthermore it contains the encryption/decryption methods.
+ */
+public class DiffieHellman {
+
+ private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding";
+ private static final String KEY_PAIR_ALGORITHM = "EC";
+ private static final int KEY_SIZE = 521; // 224 | 256 | 384 | 521
+ private static final String KEY_AGREEMENT_ALGORITHM = "ECDH";
+ private static final String KEY_FACTORY_ALGORITHM = "EC";
+
+ private static DiffieHellman instance;
+
+ private PublicKey publickey;
+ private KeyAgreement keyAgreement;
+
+ private byte[] sharedSecret;
+ private IvParameterSpec ivParameterSpec;
+
+
+ private DiffieHellman() {
+ initialize();
+ }
+
+ /**
+ * Singleton pattern
+ * @return {@link DiffieHellman}
+ */
+ public static DiffieHellman getInstance() {
+ if(instance == null) {
+ instance = new DiffieHellman();
+ }
+
+ return instance;
+ }
+
+ /**
+ * Generates a public and a private key using an elliptic curve algorithm.
+ * The private key is fed into the key agreement instance.
+ */
+ private void initialize() {
+ try {
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(KEY_PAIR_ALGORITHM);
+ kpg.initialize(KEY_SIZE);
+
+ KeyPair kp = kpg.generateKeyPair();
+ publickey = kp.getPublic();
+
+ keyAgreement = KeyAgreement.getInstance(KEY_AGREEMENT_ALGORITHM);
+ keyAgreement.init(kp.getPrivate());
+
+ } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Encrypts data.
+ * @param data data to encrypt
+ * @return To String converted and encrypted data
+ */
+ public String encrypt(String data) {
+ try {
+ Cipher c = Cipher.getInstance(CIPHER_ALGORITHM);
+ c.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(sharedSecret, CIPHER_ALGORITHM), ivParameterSpec);
+
+ byte[] cipherText = c.doFinal(data.getBytes(StandardCharsets.UTF_8));
+ return Base64.encodeToString(cipherText, Base64.NO_WRAP);
+
+ } catch (BadPaddingException | InvalidKeyException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (InvalidAlgorithmParameterException e) {
+ e.printStackTrace();
+ }
+ return data;
+ }
+
+ /**
+ * Decrypts data with the current shared secret.
+ * @param data data to decrypt
+ * @return To String converted and decrypted data
+ */
+ public String decrypt(String data) {
+ try {
+ Cipher c = Cipher.getInstance(CIPHER_ALGORITHM);
+ c.init(Cipher.DECRYPT_MODE, new SecretKeySpec(sharedSecret, CIPHER_ALGORITHM), ivParameterSpec);
+
+ byte[] cipherText = Base64.decode(data, Base64.NO_WRAP);
+ return new String(c.doFinal(cipherText), StandardCharsets.UTF_8);
+
+ } catch (BadPaddingException | InvalidKeyException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (InvalidAlgorithmParameterException e) {
+ e.printStackTrace();
+ }
+ return data;
+ }
+
+ /**
+ * Generates a shared secret and derives an initialisation vector from it.
+ * @param pk public key of the sync partner
+ */
+ public void setForeignPublicKey(PublicKey pk) {
+ try {
+ keyAgreement.doPhase(pk, true);
+
+ byte[] tmpSharedSecret = keyAgreement.generateSecret();
+ sharedSecret = Arrays.copyOfRange(tmpSharedSecret, 0, 32);
+
+ byte[] inputVector = Arrays.copyOfRange(sharedSecret, 32, 48);
+ ivParameterSpec = new IvParameterSpec(inputVector);
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @return this devices public key
+ */
+ public PublicKey getPublicKey() {
+ return publickey;
+ }
+
+ public static String publicKeyToString(PublicKey key) {
+ return Base64.encodeToString(key.getEncoded(), Base64.DEFAULT);
+ }
+
+ public static PublicKey publicKeyFromString(String key) throws NoSuchAlgorithmException, InvalidKeySpecException {
+ byte[] input = Base64.decode(key, Base64.DEFAULT);
+ return KeyFactory.getInstance(KEY_FACTORY_ALGORITHM).generatePublic(new X509EncodedKeySpec(input));
+ }
+}
diff --git a/app/src/main/java/lu/circl/mispbump/security/KeyStoreWrapper.java b/app/src/main/java/lu/circl/mispbump/security/KeyStoreWrapper.java
new file mode 100644
index 0000000..0576074
--- /dev/null
+++ b/app/src/main/java/lu/circl/mispbump/security/KeyStoreWrapper.java
@@ -0,0 +1,273 @@
+package lu.circl.mispbump.security;
+
+import android.security.keystore.KeyGenParameterSpec;
+import android.security.keystore.KeyProperties;
+import android.util.Base64;
+import android.util.Log;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.util.Arrays;
+import java.util.Enumeration;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+
+public class KeyStoreWrapper {
+
+ private static final String TAG = "KeyStoreWrapper";
+
+ public static final String USER_INFO_ALIAS = "ALIAS_USER_INFO";
+ public static final String USER_ORGANISATION_INFO_ALIAS = "ALIAS_USER_ORGANISATION_INFO";
+ public static final String AUTOMATION_ALIAS = "ALIAS_AUTOMATION_KEY";
+ public static final String SERVER_URL_ALIAS = "ALIAS_SERVER_URL";
+ public static final String UPLOAD_INFORMATION_ALIAS = "ALIAS_UPLOAD_INFORMATION";
+
+ private static final String KEYSTORE_PROVIDER = "AndroidKeyStore";
+ private static final String CIPHER_ALGORITHM = "AES/GCM/NoPadding";
+
+ private String KEYSTORE_ALIAS;
+
+ /**
+ * Wraps the android key store to easily encrypt and decrypt sensitive data.
+ * @param alias identifies a key store entry (see public static ALIAS variables).
+ */
+ public KeyStoreWrapper(String alias) {
+ KEYSTORE_ALIAS = alias;
+ }
+
+ /**
+ * @return wheter an entry for this alias already exists.
+ */
+ private boolean isInitialized() {
+ try {
+ KeyStore ks = KeyStore.getInstance(KEYSTORE_PROVIDER);
+ ks.load(null);
+
+ if (ks.containsAlias(KEYSTORE_ALIAS)) {
+ return true;
+ }
+ } catch (KeyStoreException e) {
+ e.printStackTrace();
+ } catch (CertificateException e) {
+ e.printStackTrace();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return false;
+ }
+
+ /**
+ *
+ * @return SecretKey associated with the given alias.
+ */
+ private SecretKey getStoredKey() {
+ try {
+
+ KeyStore ks = KeyStore.getInstance(KEYSTORE_PROVIDER);
+ ks.load(null);
+ return (SecretKey) ks.getKey(KEYSTORE_ALIAS, null);
+
+ } catch (KeyStoreException e) {
+ e.printStackTrace();
+ } catch (CertificateException e) {
+ e.printStackTrace();
+ } catch (UnrecoverableKeyException e) {
+ e.printStackTrace();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+ /**
+ * Generates a new key.
+ * @return the newly generated key.
+ */
+ private SecretKey generateKey() {
+ try {
+
+ // androids key generator
+ final KeyGenerator keyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, KEYSTORE_PROVIDER);
+
+ // specs for the generated key
+ final KeyGenParameterSpec keyGenParameterSpec = new KeyGenParameterSpec.Builder(KEYSTORE_ALIAS,
+ KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT)
+ .setKeySize(256)
+ .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+ .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+ .build();
+
+ // initialize KeyGenerator and generate a secret key
+ keyGenerator.init(keyGenParameterSpec);
+ return keyGenerator.generateKey();
+
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (NoSuchProviderException e) {
+ e.printStackTrace();
+ } catch (InvalidAlgorithmParameterException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+ /**
+ * Deletes the key associated with the current alias.
+ */
+ public void deleteStoredKey() {
+ try {
+ KeyStore ks = KeyStore.getInstance(KEYSTORE_PROVIDER);
+ ks.load(null);
+ ks.deleteEntry(KEYSTORE_ALIAS);
+ } catch (KeyStoreException e) {
+ e.printStackTrace();
+ } catch (CertificateException e) {
+ e.printStackTrace();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Encrypt data with given algorithm and key associated with alias.
+ * @param data data to encrypt.
+ * @return encrypted data as String.
+ * @throws NoSuchPaddingException padding not found
+ * @throws NoSuchAlgorithmException algorithm not found
+ * @throws InvalidKeyException invalid key
+ * @throws BadPaddingException bad padding
+ * @throws IllegalBlockSizeException illegal block size
+ */
+ public String encrypt(String data) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
+ SecretKey secretKey;
+
+ if (isInitialized()) {
+ secretKey = getStoredKey();
+ } else {
+ secretKey = generateKey();
+ }
+
+ final Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+ cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+
+ byte[] byteData = data.getBytes(StandardCharsets.UTF_8);
+ byte[] combined = getCombinedArray(cipher.getIV(), cipher.doFinal(byteData));
+ return Base64.encodeToString(combined, Base64.NO_WRAP);
+ }
+
+ /**
+ * Decrypts data with given algorithm and key associated with alias.
+ * @param input encrypted data.
+ * @return decrypted data as String.
+ * @throws NoSuchPaddingException padding not found
+ * @throws NoSuchAlgorithmException algorithm not found
+ * @throws InvalidAlgorithmParameterException invalid algorithm parameters
+ * @throws InvalidKeyException invalid key
+ * @throws BadPaddingException bad padding
+ * @throws IllegalBlockSizeException illegal block size
+ */
+ public String decrypt(String input) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
+
+ // extract iv from save data
+// String[] parts = input.split(":::");
+// byte[] iv = Base64.decode(parts[0], Base64.DEFAULT);
+// byte[] data = Base64.decode(parts[1], Base64.DEFAULT);
+
+ byte[] in = Base64.decode(input, Base64.NO_WRAP);
+ IvAndData ivAndData = splitCombinedArray(in, 12);
+
+ final Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+ final GCMParameterSpec gcmSpec = new GCMParameterSpec(128, ivAndData.iv);
+
+ cipher.init(Cipher.DECRYPT_MODE, getStoredKey(), gcmSpec);
+
+ return new String(cipher.doFinal(ivAndData.data), StandardCharsets.UTF_8);
+ }
+
+ /**
+ * Removes all aliases and the associated keys.
+ * Note: all encrypted data cannot be decrypted anymore!
+ */
+ public static void deleteAllStoredKeys() {
+ try {
+
+ KeyStore ks = KeyStore.getInstance(KEYSTORE_PROVIDER);
+ ks.load(null);
+
+ Log.i(TAG, "Size: " + ks.size());
+
+ Enumeration aliases = ks.aliases();
+
+ while (aliases.hasMoreElements()) {
+ String alias = aliases.nextElement();
+ ks.deleteEntry(alias);
+ }
+
+ } catch (KeyStoreException e) {
+ e.printStackTrace();
+ } catch (CertificateException e) {
+ e.printStackTrace();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Combine IV and encrypted data.
+ * @param iv initialisation vector
+ * @param encryptedData encrypted data
+ * @return combination of iv and encrypted data
+ */
+ private byte[] getCombinedArray(byte[] iv, byte[] encryptedData) {
+
+ Log.i(TAG, "iv length = " + iv.length);
+
+ byte[] combined = new byte[iv.length + encryptedData.length];
+ for (int i = 0; i < combined.length; ++i) {
+ combined[i] = i < iv.length ? iv[i] : encryptedData[i - iv.length];
+ }
+ return combined;
+ }
+
+ private IvAndData splitCombinedArray(byte[] input, int ivLength) {
+ byte[] iv = Arrays.copyOfRange(input, 0, ivLength);
+ byte[] data = Arrays.copyOfRange(input, ivLength, input.length);
+ return new IvAndData(iv, data);
+ }
+
+ public class IvAndData {
+ IvAndData(byte[] iv, byte[] data) {
+ this.iv = iv;
+ this.data = data;
+ }
+
+ byte[] iv;
+ byte[] data;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
new file mode 100644
index 0000000..271b405
--- /dev/null
+++ b/app/src/main/res/anim/fade_in.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml
new file mode 100644
index 0000000..b0caf35
--- /dev/null
+++ b/app/src/main/res/anim/fade_out.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_down.xml b/app/src/main/res/anim/slide_down.xml
deleted file mode 100644
index ad40deb..0000000
--- a/app/src/main/res/anim/slide_down.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
new file mode 100644
index 0000000..6fb52a3
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml
new file mode 100644
index 0000000..020a1be
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_left.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_up.xml b/app/src/main/res/anim/slide_up.xml
deleted file mode 100644
index a731689..0000000
--- a/app/src/main/res/anim/slide_up.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/animator/rotation_cw.xml b/app/src/main/res/animator/rotation_cw.xml
new file mode 100644
index 0000000..fdc9066
--- /dev/null
+++ b/app/src/main/res/animator/rotation_cw.xml
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_in_left.xml b/app/src/main/res/animator/slide_in_left.xml
new file mode 100644
index 0000000..ddc7c45
--- /dev/null
+++ b/app/src/main/res/animator/slide_in_left.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_in_right.xml b/app/src/main/res/animator/slide_in_right.xml
new file mode 100644
index 0000000..206720e
--- /dev/null
+++ b/app/src/main/res/animator/slide_in_right.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_out_left.xml b/app/src/main/res/animator/slide_out_left.xml
new file mode 100644
index 0000000..e3e2d1d
--- /dev/null
+++ b/app/src/main/res/animator/slide_out_left.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/animator/slide_out_right.xml b/app/src/main/res/animator/slide_out_right.xml
new file mode 100644
index 0000000..10d8add
--- /dev/null
+++ b/app/src/main/res/animator/slide_out_right.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 789e157..c7bd21d 100644
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,34 +1,34 @@
-
-
-
-