ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-16 23:18:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor HTTP GET /restful/keyring/add

Browse Source
This commit is contained in:
Andrew Bettison 2015-08-24 22:39:58 +09:30
parent 380a72113c
commit 8834a81575
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
keyring_restful.c
View File

@ -70,6 +70,36 @@ static int http_request_keyring_response(struct httpd_request *r, uint16_t resul
return result;
}
static int http_request_keyring_response_identity(struct httpd_request *r, uint16_t result, const char *message, const keyring_identity *id)
{
const sid_t *sidp = NULL;
const char *did = NULL;
const char *name = NULL;
keyring_identity_extract(id, &sidp, &did, &name);
if (!sidp)
return http_request_keyring_response(r, 501, "Identity has no SID");
unsigned i = 0;
if (sidp) {
r->http.response.result_extra[i].label = "sid";
r->http.response.result_extra[i].value.type = JSON_STRING_NULTERM;
r->http.response.result_extra[i].value.u.string.content = alloca_tohex_sid_t(*sidp);
++i;
}
if (did) {
r->http.response.result_extra[i].label = "did";
r->http.response.result_extra[i].value.type = JSON_STRING_NULTERM;
r->http.response.result_extra[i].value.u.string.content = did;
++i;
}
if (name) {
r->http.response.result_extra[i].label = "name";
r->http.response.result_extra[i].value.type = JSON_STRING_NULTERM;
r->http.response.result_extra[i].value.u.string.content = name;
++i;
}
return http_request_keyring_response(r, result, message);
}
static HTTP_CONTENT_GENERATOR restful_keyring_identitylist_json_content;
static int restful_keyring_identitylist_json(httpd_request *r, const char *remainder)
@ -166,18 +196,7 @@ static int restful_keyring_add(httpd_request *r, const char *remainder)
const keyring_identity *id = keyring_create_identity(keyring, pin ? pin : "");
if (id == NULL)
return http_request_keyring_response(r, 501, "Could not create identity");
const sid_t *sidp = NULL;
const char *did = "";
const char *name = "";
keyring_identity_extract(id, &sidp, &did, &name);
if (!sidp)
return http_request_keyring_response(r, 501, "New identity has no SID");
if (keyring_commit(keyring) == -1)
return http_request_keyring_response(r, 501, "Could not store new identity");
strbuf s = strbuf_alloca(200);
strbuf_puts(s, "{\n \"sid\":");
strbuf_json_hex(s, sidp->binary, sizeof sidp->binary);
strbuf_puts(s, "\n}");
http_request_response_static(&r->http, 200, CONTENT_TYPE_JSON, strbuf_str(s), strbuf_len(s));
return 1;
return http_request_keyring_response_identity(r, 200, CONTENT_TYPE_JSON, id);
}

17
tests/keyringrestful
View File

@ -153,20 +153,21 @@ test_keyringAdd() {
assertStdoutGrep --stderr --matches=1 "^$SID::\$"
}
doc_keyringAddPin="HTTP RESTful add keyring identity with non-empty PIN"
doc_keyringAddPin="HTTP RESTful add keyring identity with PIN"
setup_keyringAddPin() {
IDENTITY_COUNT=2
setup
}
test_keyringAddPin() {
executeOk curl \
--silent --fail --show-error \
--silent --show-error --write-out '%{http_code}' \
--output add.json \
--dump-header http.headers \
--basic --user harry:potter \
"http://$addr_localhost:$PORTA/restful/keyring/add?pin=1234"
tfw_cat http.headers add.json
tfw_preserve add.json
assertStdoutIs '200'
SID="$(jq -r '.sid' add.json)"
executeOk_servald keyring list
assert_keyring_list 2
@ -174,6 +175,18 @@ test_keyringAddPin() {
executeOk_servald keyring list --entry-pin=1234
assert_keyring_list 3
assertStdoutGrep --stderr --matches=1 "^$SID::\$"
# Now the server has internalised the PIN, so the new identity appears in the
# list
executeOk curl \
--silent --fail --show-error \
--output list.json \
--dump-header http.headers \
--basic --user harry:potter \
"http://$addr_localhost:$PORTA/restful/keyring/identities.json"
tfw_cat http.headers list.json
tfw_preserve list.json
transform_list_json list.json ids.json
assertJq ids.json 'contains([{"sid": "'$SIDA1'"}])'
}
runTests "$@"