Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/lavabit/magma.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLadar Levison <ladar@lavabit.com>2017-04-12 05:02:58 +0300
committerLadar Levison <ladar@lavabit.com>2017-04-12 05:02:58 +0300
commit223f7ac0f5042bad352ab1adae007c9a5351b848 (patch)
tree229083f284d31857b804820cf964a274c3067966 /check/magma
parentd4b214eb087b917ffa56728d08f7611631be1438 (diff)
Added secure auth test. Fixed the t.camel.sh script to work over HTTPS.
Diffstat (limited to 'check/magma')
-rw-r--r--check/magma/servers/camel/camel_check.c1
-rw-r--r--check/magma/servers/camel/camel_check_network.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/check/magma/servers/camel/camel_check.c b/check/magma/servers/camel/camel_check.c
index de833856..2e762dfb 100644
--- a/check/magma/servers/camel/camel_check.c
+++ b/check/magma/servers/camel/camel_check.c
@@ -15,6 +15,7 @@ START_TEST (check_camel_auth_s) {
stringer_t *errmsg = MANAGEDBUF(1024);
if (status() && !check_camel_auth_sthread(false, errmsg)) outcome = false;
+ else if (status() && outcome && !check_camel_auth_sthread(true, errmsg)) outcome = false;
log_test("HTTP / NETWORK / CAMEL / LOGIN / SINGLE THREADED:", errmsg);
ck_assert_msg(outcome, st_char_get(errmsg));
diff --git a/check/magma/servers/camel/camel_check_network.c b/check/magma/servers/camel/camel_check_network.c
index 5eac4bf4..9b771304 100644
--- a/check/magma/servers/camel/camel_check_network.c
+++ b/check/magma/servers/camel/camel_check_network.c
@@ -195,16 +195,13 @@ bool_t check_camel_login(stringer_t *user, stringer_t *pass, stringer_t *cookie,
// LOW: Test the four different ways of preserving a session token: Cookie, URL param, JSON param, Form post.
bool_t check_camel_auth_sthread(bool_t secure, stringer_t *errmsg) {
- client_t *client = NULL;
stringer_t *cookie = MANAGEDBUF(1024);
if (!check_camel_login(PLACER("princess", 8), PLACER("password", 8), cookie, secure)) {
-
st_sprint(errmsg, "Failed to return successful state after auth request.");
return false;
}
- client_close(client);
return true;
}