aboutsummaryrefslogtreecommitdiffstats
path: root/src/manager
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2007-09-27 07:15:47 +0000
committerMartin Willi <martin@strongswan.org>2007-09-27 07:15:47 +0000
commit93720075df0498f1ad60ed1d510045814b5207f1 (patch)
treeec3d6739b9019710093d017448d5ca306eaf1880 /src/manager
parent324abae2ef4e68d54fc3a3a4271fb5bafff8171a (diff)
downloadstrongswan-93720075df0498f1ad60ed1d510045814b5207f1.tar.bz2
strongswan-93720075df0498f1ad60ed1d510045814b5207f1.tar.xz
implemented SHA1 encrypted passwords for manager
Diffstat (limited to 'src/manager')
-rw-r--r--src/manager/database.c20
-rw-r--r--src/manager/lib/request.c4
-rw-r--r--src/manager/manager.dbbin12288 -> 12288 bytes
3 files changed, 21 insertions, 3 deletions
diff --git a/src/manager/database.c b/src/manager/database.c
index 46ac5a6a9..ebd9fa971 100644
--- a/src/manager/database.c
+++ b/src/manager/database.c
@@ -25,6 +25,7 @@
#include <sqlite3.h>
#include <library.h>
#include <enumerator.h>
+#include <crypto/hashers/hasher.h>
typedef struct private_database_t private_database_t;
@@ -100,20 +101,37 @@ static enumerator_t* empty_enumerator_create()
static int login(private_database_t *this, char *username, char *password)
{
sqlite3_stmt *stmt;
+ hasher_t *hasher;
+ chunk_t hash, data;
+ size_t username_len, password_len;
int uid = 0;
+ char *str;
+
+ /* hash = SHA1( username | password ) */
+ hasher = hasher_create(HASH_SHA1);
+ hash = chunk_alloca(hasher->get_hash_size(hasher));
+ username_len = strlen(username);
+ password_len = strlen(password);
+ data = chunk_alloca(username_len + password_len);
+ memcpy(data.ptr, username, username_len);
+ memcpy(data.ptr + username_len, password, password_len);
+ hasher->get_hash(hasher, data, hash.ptr);
+ hasher->destroy(hasher);
+ str = chunk_to_hex(hash, FALSE);
if (sqlite3_prepare_v2(this->db,
"SELECT oid FROM users WHERE username = ? AND password = ?;",
-1, &stmt, NULL) == SQLITE_OK)
{
if (sqlite3_bind_text(stmt, 1, username, -1, SQLITE_STATIC) == SQLITE_OK &&
- sqlite3_bind_text(stmt, 2, password, -1, SQLITE_STATIC) == SQLITE_OK &&
+ sqlite3_bind_text(stmt, 2, str, -1, SQLITE_STATIC) == SQLITE_OK &&
sqlite3_step(stmt) == SQLITE_ROW)
{
uid = sqlite3_column_int(stmt, 0);
}
sqlite3_finalize(stmt);
}
+ free(str);
return uid;
}
diff --git a/src/manager/lib/request.c b/src/manager/lib/request.c
index 42cd9df2c..4623b3860 100644
--- a/src/manager/lib/request.c
+++ b/src/manager/lib/request.c
@@ -62,12 +62,12 @@ struct private_request_t {
* ClearSilver cgiwrap is not threadsave, so we use a private
* context for each thread.
*/
-__thread FCGX_Request *req;
+static __thread FCGX_Request *req;
/**
* length of param list in req->envp
*/
-__thread int req_env_len;
+static __thread int req_env_len;
/**
* fcgiwrap read callback
diff --git a/src/manager/manager.db b/src/manager/manager.db
index 01c1f2722..23b6ed2e0 100644
--- a/src/manager/manager.db
+++ b/src/manager/manager.db
Binary files differ