mirror of
https://github.com/Dadoum/anisette-v3-server.git
synced 2024-11-21 19:06:07 +00:00
Use standard error results
This commit is contained in:
Dadoum
parent
962d2a695a
commit
8fe58869e8
5
dub.json
5
dub.json
@ -8,10 +8,11 @@
|
||||
"dependencies": {
|
||||
"provision": {
|
||||
"repository": "git+https://github.com/Dadoum/Provision.git",
|
||||
"version": "b131c625da882700cdda46fcc5172b79eed25f43"
|
||||
"version": "a007cb290da1a21e231a1a4a335a047a151ca24f"
|
||||
},
|
||||
"slf4d": "~>2.1.1",
|
||||
"vibe-d": "~>0.9.7-alpha.2"
|
||||
"vibe-d:web": "~>0.9.7-alpha.2",
|
||||
"vibe-d:http": "~>0.9.7-alpha.2"
|
||||
},
|
||||
|
||||
"configurations": [
|
||||
|
||||
74
source/app.d
74
source/app.d
@ -1,3 +1,4 @@
|
||||
import core.time;
|
||||
import core.memory;
|
||||
|
||||
import std.algorithm.searching;
|
||||
@ -16,7 +17,11 @@ import std.uni;
|
||||
import std.uuid;
|
||||
import std.zip;
|
||||
|
||||
import vibe.d;
|
||||
import vibe.core.core;
|
||||
import vibe.http.websockets;
|
||||
import vibe.http.server;
|
||||
import vibe.http.router;
|
||||
import vibe.web.web;
|
||||
|
||||
import slf4d;
|
||||
import slf4d: Logger;
|
||||
@ -175,7 +180,7 @@ class AnisetteService {
|
||||
"X-Mme-Device-Id": v1Device.uniqueDeviceIdentifier,
|
||||
];
|
||||
|
||||
response.headers["Implementation-Version"] = brandingCode;
|
||||
res.headers["Implementation-Version"] = brandingCode;
|
||||
res.writeBody(responseJson.toString(JSONOptions.doNotEscapeSlashes), "application/json");
|
||||
log.infoF!"[>>] 200 OK %s"(responseJson);
|
||||
}
|
||||
@ -190,8 +195,8 @@ class AnisetteService {
|
||||
"user_agent": "akd/1.0 CFNetwork/808.1.4"
|
||||
];
|
||||
|
||||
response.headers["Implementation-Version"] = brandingCode;
|
||||
response.writeBody(responseJson.toString(JSONOptions.doNotEscapeSlashes), "application/json");
|
||||
res.headers["Implementation-Version"] = brandingCode;
|
||||
res.writeBody(responseJson.toString(JSONOptions.doNotEscapeSlashes), "application/json");
|
||||
}
|
||||
|
||||
@method(HTTPMethod.POST)
|
||||
@ -267,20 +272,22 @@ class AnisetteService {
|
||||
@path("/v3/provisioning_session")
|
||||
void provisionSession(scope WebSocket socket) {
|
||||
auto log = getLogger();
|
||||
log.info("[<<] anisette-v3 /v3/provisionSession connected.");
|
||||
scope(exit) socket.close();
|
||||
|
||||
auto requestUUID = randomUUID().toString(); // Assign a random UUID to the request to make it easier to track.
|
||||
log.infoF!"[<< %s] anisette-v3 /v3/provisionSession connected."(requestUUID);
|
||||
|
||||
try {
|
||||
JSONValue giveIdentifier = [
|
||||
"result": "GiveIdentifier"
|
||||
];
|
||||
socket.send(giveIdentifier.toString(JSONOptions.doNotEscapeSlashes));
|
||||
|
||||
log.info("[>>] Asking for identifier.");
|
||||
log.infoF!"[>> %s] Asking for identifier."(requestUUID);
|
||||
if (!socket.waitForData(timeout)) {
|
||||
JSONValue timeoutJs = [
|
||||
"result": "Timeout"
|
||||
];
|
||||
log.info("[>>] Timeout!");
|
||||
log.infoF!"[>> %s] Timeout!"(requestUUID);
|
||||
socket.send(timeoutJs.toString(JSONOptions.doNotEscapeSlashes));
|
||||
socket.close();
|
||||
return;
|
||||
@ -288,21 +295,21 @@ class AnisetteService {
|
||||
|
||||
auto res = parseJSON(socket.receiveText());
|
||||
ubyte[] requestedIdentifier = Base64.decode(res["identifier"].str());
|
||||
log.info("[>>] Got it.");
|
||||
log.infoF!"[>> %s] Got it."(requestUUID);
|
||||
|
||||
if (requestedIdentifier.length != 16) {
|
||||
JSONValue response = [
|
||||
"result": "InvalidIdentifier"
|
||||
];
|
||||
|
||||
log.info("[>>] It is invalid.");
|
||||
log.infoF!"[>> %s] It is invalid."(requestUUID);
|
||||
socket.send(response.toString(JSONOptions.doNotEscapeSlashes));
|
||||
socket.close();
|
||||
return;
|
||||
}
|
||||
|
||||
string identifier = UUID(requestedIdentifier[0..16]).toString();
|
||||
log.infoF!("[<<] Correct identifier (%s).")(identifier);
|
||||
log.infoF!("[<< %s] Correct identifier (%s).")(requestUUID, identifier);
|
||||
|
||||
GC.disable(); // garbage collector can deallocate ADI parts since it can't find the pointers.
|
||||
scope(exit) GC.enable();
|
||||
@ -321,7 +328,7 @@ class AnisetteService {
|
||||
JSONValue response = [
|
||||
"result": "GiveStartProvisioningData"
|
||||
];
|
||||
log.info("[>>] Okay asking for spim now.");
|
||||
log.infoF!"[>> %s] Okay asking for spim now."(requestUUID);
|
||||
|
||||
socket.send(response.toString(JSONOptions.doNotEscapeSlashes));
|
||||
|
||||
@ -329,40 +336,54 @@ class AnisetteService {
|
||||
JSONValue timeoutJs = [
|
||||
"result": "Timeout"
|
||||
];
|
||||
log.info("[>>] Timeout!");
|
||||
log.infoF!"[>> %s] Timeout!"(requestUUID);
|
||||
socket.send(timeoutJs.toString(JSONOptions.doNotEscapeSlashes));
|
||||
socket.close();
|
||||
return;
|
||||
}
|
||||
|
||||
uint session;
|
||||
try {
|
||||
res = parseJSON(socket.receiveText());
|
||||
|
||||
string spim = res["spim"].str();
|
||||
log.info("[<<] Received SPIM.");
|
||||
log.infoF!"[<< %s] Received SPIM."(requestUUID);
|
||||
auto cpimAndCo = adi.startProvisioning(-2, Base64.decode(spim));
|
||||
auto session = cpimAndCo.session;
|
||||
session = cpimAndCo.session;
|
||||
|
||||
response = [
|
||||
"result": "GiveEndProvisioningData",
|
||||
"cpim": Base64.encode(cpimAndCo.clientProvisioningIntermediateMetadata)
|
||||
];
|
||||
log.info("[>>] Okay gimme ptm tk.");
|
||||
log.infoF!"[>> %s] Okay gimme ptm tk."(requestUUID);
|
||||
|
||||
socket.send(response.toString(JSONOptions.doNotEscapeSlashes));
|
||||
} catch (Exception ex) {
|
||||
JSONValue error = [
|
||||
"result": "StartProvisioningError",
|
||||
"message": format!"%s (request id: %s)"(ex.msg, requestUUID)
|
||||
];
|
||||
log.errorF!"[>> %s] anisette-v3 error: %s"(requestUUID, ex);
|
||||
socket.send(error.toString());
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (!socket.waitForData(timeout)) {
|
||||
JSONValue timeoutJs = [
|
||||
"result": "Timeout"
|
||||
];
|
||||
log.info("[>>] Timeout!");
|
||||
log.infoF!"[>> %s] Timeout!"(requestUUID);
|
||||
socket.send(timeoutJs.toString(JSONOptions.doNotEscapeSlashes));
|
||||
socket.close();
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
res = parseJSON(socket.receiveText());
|
||||
string ptm = res["ptm"].str();
|
||||
string tk = res["tk"].str();
|
||||
log.info("[<<] Received PTM and TK.");
|
||||
log.infoF!"[<< %s] Received PTM and TK."(requestUUID);
|
||||
|
||||
adi.endProvisioning(session, Base64.decode(ptm), Base64.decode(tk));
|
||||
|
||||
@ -375,19 +396,18 @@ class AnisetteService {
|
||||
)
|
||||
)
|
||||
];
|
||||
log.info("[>>] Okay all right here is your provisioning data.");
|
||||
|
||||
socket.send(response.toString(JSONOptions.doNotEscapeSlashes));
|
||||
} catch (Throwable t) {
|
||||
} catch (Exception ex) {
|
||||
JSONValue error = [
|
||||
"result": "NonStandard-" ~ typeid(t).name,
|
||||
"message": t.msg
|
||||
"result": "EndProvisioningError",
|
||||
"message": format!"%s (request id: %s)"(ex.msg, requestUUID)
|
||||
];
|
||||
log.errorF!"[>>] anisette-v3 error: %s"(t);
|
||||
log.errorF!"[>> %s] anisette-v3 error: %s"(requestUUID, ex);
|
||||
socket.send(error.toString());
|
||||
} finally {
|
||||
socket.close();
|
||||
return;
|
||||
}
|
||||
|
||||
log.infoF!"[>> %s] Okay all right here is your provisioning data."(requestUUID);
|
||||
socket.send(response.toString(JSONOptions.doNotEscapeSlashes));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user