MISP
/
misp-bump
mirror of https://github.com/MISP/misp-bump
2
0
Fork 0
Code Issues Releases Wiki Activity

edit upload procedure

pull/5/head
Felix Prahl-Kamps 2018-08-19 17:35:20 +02:00
parent 6a582f5ada
commit 125f0b8b9c
4 changed files with 459 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/overview/wg/its/mispbump/QrSyncActivity.java
View File

@ -213,11 +213,7 @@ public class QrSyncActivity extends AppCompatActivity implements View.OnClickLis
syncInformationReceivedDialog(new SyncInformationQr(cryptography.decrypt(qrData)));
} catch (JSONException e) {
Log.e("MISP_LOG", "onReadQrCode: ", e);
notExpectedFormatDialog();
}
break;

64
app/src/main/java/de/overview/wg/its/mispbump/SyncUploadActivity.java
View File

@ -203,15 +203,15 @@ public class SyncUploadActivity extends AppCompatActivity implements View.OnClic
boolean errorFound = false;
for (int i = 0; i < uploadStates.length; i++) {
for(UploadState state : uploadStates) {
if (!errorFound && uploadStates[i].getCurrentState() == UploadState.State.ERROR) {
if (!errorFound && state.getCurrentState() == UploadState.State.ERROR) {
errorFound = true;
continue;
}
if (errorFound) {
uploadStates[i].setFollowError();
state.setFollowError();
}
}
}
@ -233,8 +233,13 @@ public class SyncUploadActivity extends AppCompatActivity implements View.OnClic
partnerServer = partnerInformation.getServer();
partnerSyncUser = partnerInformation.getUser();
if (partnerOrganisation == null || partnerServer == null || partnerSyncUser == null) {
state.setError("Partners information format is incorrect");
setApplicationError(false);
} else {
state.setDone();
executeNextTask();
}
} else {
state.setError("Partners information format is incorrect");
@ -260,6 +265,7 @@ public class SyncUploadActivity extends AppCompatActivity implements View.OnClic
}
private void createOrganisation(final UploadState state, boolean undo) {
state.setInProgress();
if (!undo) {
@ -268,11 +274,7 @@ public class SyncUploadActivity extends AppCompatActivity implements View.OnClic
public void onResult(JSONObject organisationInformation) {
try {
int orgId = new Organisation(organisationInformation).getId();
partnerSyncUser.setOrgId(orgId);
partnerSyncUser.setAuthkey(TempAuth.TMP_AUTH_KEY);
partnerSyncUser.setRoleId(User.RoleId.SYNC_USER);
partnerSyncUser.setOrgId(new Organisation(organisationInformation).getId());
state.setDone();
executeNextTask();
@ -290,12 +292,28 @@ public class SyncUploadActivity extends AppCompatActivity implements View.OnClic
setApplicationError(true);
}
});
} else {
mispRequest.removeOrganisation(partnerOrganisation.getId(), new MispRequest.DeleteCallback() {
@Override
public void onSuccess() {
state.setDone();
}
@Override
public void onError(VolleyError volleyError) {
state.setError(ReadableError.toReadable(volleyError));
}
});
}
}
private void createSyncUser(final UploadState state, boolean undo) {
state.setInProgress();
partnerSyncUser.setAuthkey(TempAuth.TMP_AUTH_KEY);
partnerSyncUser.setRoleId(User.RoleId.SYNC_USER);
if (!undo) {
mispRequest.addUser(partnerSyncUser, new MispRequest.UserCallback() {
@Override
@ -310,6 +328,18 @@ public class SyncUploadActivity extends AppCompatActivity implements View.OnClic
setApplicationError(true);
}
});
} else {
mispRequest.removeUser(partnerSyncUser.getId(), new MispRequest.DeleteCallback() {
@Override
public void onSuccess() {
state.setDone();
}
@Override
public void onError(VolleyError volleyError) {
state.setError(ReadableError.toReadable(volleyError));
}
});
}
}
@ -350,6 +380,18 @@ public class SyncUploadActivity extends AppCompatActivity implements View.OnClic
setApplicationError(true);
}
});
} else {
mispRequest.removeOrganisation(partnerOrganisation.getId(), new MispRequest.DeleteCallback() {
@Override
public void onSuccess() {
state.setDone();
}
@Override
public void onError(VolleyError volleyError) {
state.setError(ReadableError.toReadable(volleyError));
}
});
}
}
@ -369,6 +411,12 @@ public class SyncUploadActivity extends AppCompatActivity implements View.OnClic
state.setError(ReadableError.toReadable(volleyError));
}
});
} else {
}
}
private void addToSyncedList() {
// todo implementation
}
}

117
app/src/main/java/de/overview/wg/its/mispbump/network/MispRequest.java
View File

@ -71,6 +71,44 @@ public class MispRequest {
requestQueue.add(r);
}
public void getOrganisations(final OrganisationsCallback callback) {
Response.Listener<JSONArray> listener = new Response.Listener<JSONArray>() {
@Override
public void onResponse(JSONArray response) {
JSONArray resultArray = new JSONArray();
int orgCount = response.length();
for (int i = 0; i < orgCount; i++) {
try {
resultArray.put(response.getJSONObject(i).getJSONObject("Organisation"));
} catch (JSONException e) {
e.printStackTrace();
}
}
callback.onResult(resultArray);
}
};
Response.ErrorListener errorListener = new Response.ErrorListener() {
@Override
public void onErrorResponse(VolleyError error) {
callback.onError(error);
}
};
Request r = arrayRequestWithJsonObject(
Request.Method.GET,
serverUrl + "/organisations/index",
null,
listener,
errorListener);
requestQueue.add(r);
}
/**
* @param orgId organisation ID on the MISP-Instance
* @param callback returns a single Organisation-JSON
@ -182,40 +220,27 @@ public class MispRequest {
requestQueue.add(r);
}
public void getOrganisations(final OrganisationsCallback callback) {
Response.Listener<JSONArray> listener = new Response.Listener<JSONArray>() {
public void removeOrganisation(int organisationID, final DeleteCallback callback) {
Response.Listener<JSONObject> listener = new Response.Listener<JSONObject>() {
@Override
public void onResponse(JSONArray response) {
JSONArray resultArray = new JSONArray();
int orgCount = response.length();
for(int i = 0; i < orgCount; i++) {
try {
resultArray.put(response.getJSONObject(i).getJSONObject("Organisation"));
} catch (JSONException e) {
e.printStackTrace();
}
}
callback.onResult(resultArray);
public void onResponse(JSONObject response) {
callback.onSuccess();
}
};
Response.ErrorListener errorListener = new Response.ErrorListener() {
@Override
public void onErrorResponse(VolleyError error) {
callback.onError(error);
public void onErrorResponse(VolleyError volleyError) {
callback.onError(volleyError);
}
};
Request r = arrayRequestWithJsonObject(
Request.Method.GET,
serverUrl + "/organisations/index",
Request r = objectRequest(
Request.Method.POST,
serverUrl + "/admin/organisations/delete/" + organisationID,
null,
listener,
errorListener);
errorListener
);
requestQueue.add(r);
}
@ -253,6 +278,33 @@ public class MispRequest {
requestQueue.add(r);
}
public void removeUser(int userID, final DeleteCallback callback) {
Response.Listener<JSONObject> listener = new Response.Listener<JSONObject>() {
@Override
public void onResponse(JSONObject response) {
callback.onSuccess();
}
};
Response.ErrorListener errorListener = new Response.ErrorListener() {
@Override
public void onErrorResponse(VolleyError error) {
callback.onError(error);
}
};
Request r = objectRequest(
Request.Method.POST,
serverUrl + "/admin/users/delete/" + userID,
null,
listener,
errorListener
);
requestQueue.add(r);
}
public void addServer(Server server, final ServerCallback callback) {
Response.Listener<JSONObject> listener = new Response.Listener<JSONObject>() {
@Override
@ -286,6 +338,10 @@ public class MispRequest {
requestQueue.add(r);
}
public void removeServer(Server server, final DeleteCallback callback) {
}
private JsonArrayRequestWithJsonObject arrayRequestWithJsonObject(int method, String url,
@Nullable JSONObject body,
@ -340,24 +396,37 @@ public class MispRequest {
}
public interface DeleteCallback {
void onSuccess();
void onError(VolleyError volleyError);
}
public interface ConnectionCallback {
void onResult(boolean connected);
}
public interface OrganisationsCallback {
void onResult(JSONArray organisations);
void onError(VolleyError volleyError);
}
public interface OrganisationCallback {
void onResult(JSONObject organisationInformation);
void onError(VolleyError volleyError);
}
public interface UserCallback {
void onResult(JSONObject userInformation);
void onError(VolleyError volleyError);
}
public interface ServerCallback {
void onResult(JSONObject server);
void onError(VolleyError volleyError);
}
}

14
app/src/main/res/layout/activity_upload.xml
View File

@ -35,6 +35,13 @@
app:layout_constraintBottom_toBottomOf="parent"/>
</android.support.constraint.ConstraintLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_gravity="bottom">
<View android:layout_width="0dp" android:layout_height="0dp" android:layout_weight="1"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_finish"
android:layout_width="wrap_content"
@ -42,7 +49,6 @@
app:fabSize="normal"
android:tint="@color/colorWhite"
android:src="@drawable/icon_check"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"/>
<android.support.design.widget.FloatingActionButton
@ -52,9 +58,6 @@
app:fabSize="normal"
android:tint="@color/colorWhite"
android:src="@drawable/icon_retry"
app:layout_anchor="@id/fab_finish"
app:layout_anchorGravity="start|center_vertical"
android:layout_gravity="start|center_vertical"
android:layout_margin="16dp"/>
<android.support.design.widget.FloatingActionButton
@ -64,7 +67,8 @@
app:fabSize="normal"
android:tint="@color/colorWhite"
android:src="@drawable/icon_cloud_upload"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"/>
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>