ghopp
/
taskrambler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

now signup and login with storage of a hashed password works.

release0.1.5
Georg Hopp 12 years ago
parent
06d8f88972
commit
f1a1399db7
18 changed files with 91 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      include/application/application.h
  2. 3
      include/auth/storage.h
  3. 0
      include/storage/storage.h
  4. 2
      include/user.h
  5. 32
      signuptest.html
  6. 6
      src/application/adapter/http/update.c
  7. 24
      src/application/application.c
  8. 8
      src/application/signup.c
  9. 4
      src/auth/storage/storage.c
  10. 2
      src/storage/get.c
  11. 2
      src/storage/put.c
  12. 2
      src/storage/storage.c
  13. 2
      src/storage/update.c
  14. 32
      src/taskrambler.c
  15. 2
      src/user/load.c
  16. 2
      src/user/save.c
  17. 2
      src/user/user.c
  18. 17
      src/utils/hash.c

2
include/application/application.h
View File

@ -29,7 +29,7 @@
#include "session.h" #include "session.h"
#include "queue.h" #include "queue.h"
#include "auth/credential.h" #include "auth/credential.h"
#include "storage.h"
#include "storage/storage.h"
#include "session.h" #include "session.h"
#include "user.h" #include "user.h"

3
include/auth/storage.h
View File

@ -28,8 +28,7 @@
#include <openssl/sha.h> #include <openssl/sha.h>
#include "class.h" #include "class.h"
#include <storage.h> // storage must move to storage/storage.h
// to be loadable with "
#include "storage/storage.h"
#define SALT_SIZE 32 #define SALT_SIZE 32

0
include/storage.h → include/storage/storage.h
View File

2
include/user.h
View File

@ -26,7 +26,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "class.h" #include "class.h"
#include "storage.h"
#include "storage/storage.h"
CLASS(User) { CLASS(User) {

32
signuptest.html
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>Signuptest</title>
</head>
<body>
<form action="http://localhost:11212/signup/" method="POST">
<label for="email">email:</label>
<input id="email" name="email" type="text" />
<br />
<label for="password">password:</label>
<input id="password" name="password" type="password" />
<br />
<label for="pwrepeat">repeat password:</label>
<input id="pwrepeat" name="pwrepeat" type="password" />
<br />
<label for="firstname">firstname:</label>
<input id="firstname" name="firstname" type="text" />
<br />
<label for="surname">surname:</label>
<input id="surname" name="surname" type="text" />
<br />
<input name="submit" type="submit" />
</form>
</body>
</html>
<!-- vim: set ts=4 sw=4: -->

6
src/application/adapter/http/update.c
View File

@ -195,14 +195,14 @@ signupAdapter(Application application, HttpWorker worker, Session session)
NULL == firstname || NULL == firstname ||
NULL == surname) { NULL == surname) {
// maybe this is not a 500...have to check repsonse codes. // maybe this is not a 500...have to check repsonse codes.
worker->current_response = httpResponse500();
worker->current_response = (HttpMessage)httpResponse500();
return; return;
} }
if (password->nvalue != pwrepeat->nvalue || if (password->nvalue != pwrepeat->nvalue ||
0 != memcmp(password->value, pwrepeat->value, password->nvalue)) { 0 != memcmp(password->value, pwrepeat->value, password->nvalue)) {
// maybe this is not a 500...have to check repsonse codes. // maybe this is not a 500...have to check repsonse codes.
worker->current_response = httpResponse500();
worker->current_response = (HttpMessage)httpResponse500();
return; return;
} }
@ -217,7 +217,7 @@ signupAdapter(Application application, HttpWorker worker, Session session)
(char *)(surname->value), surname->nvalue); (char *)(surname->value), surname->nvalue);
if (! applicationSignup(application, credential, user, session)) { if (! applicationSignup(application, credential, user, session)) {
worker->current_response = httpResponse500();
worker->current_response = (HttpMessage)httpResponse500();
} else { } else {
loginAdapter(application, worker, session); loginAdapter(application, worker, session);
} }

24
src/application/application.c
View File

@ -27,7 +27,7 @@
#include "class.h" #include "class.h"
#include "queue.h" #include "queue.h"
#include "application/application.h" #include "application/application.h"
#include "storage.h"
#include "storage/storage.h"
#include "utils/memory.h" #include "utils/memory.h"
@ -40,6 +40,16 @@ applicationCtor(void * _this, va_list * params)
this->val = va_arg(*params, struct randval *); this->val = va_arg(*params, struct randval *);
/*
* @TODO for both of these...each user should be identified
* by a number...that way I could use that number in the
* passwords db and no direct association between email and
* password could be made when someone get the hands on the
* password database.
*/
this->users = va_arg(*params, Storage);
this->passwords = va_arg(*params, Storage);
// initialize authenticators to use. // initialize authenticators to use.
this->nauth = va_arg(*params, size_t); this->nauth = va_arg(*params, size_t);
this->auth = memMalloc(this->nauth * sizeof(void*)); this->auth = memMalloc(this->nauth * sizeof(void*));
@ -49,16 +59,6 @@ applicationCtor(void * _this, va_list * params)
this->active_sessions = new(Queue); this->active_sessions = new(Queue);
/*
* @TODO for both of these...each user should be identified
* by a number...that way I could use that number in the
* passwords db and no direct association between email and
* password could be made when someone get the hands on the
* password database.
*/
this->users = new(Storage, "./run/users.db");
this->passwords = new(Storage, "./run/passwords.db");
return 0; return 0;
} }
@ -69,8 +69,6 @@ applicationDtor(void * _this)
Application this = _this; Application this = _this;
size_t i; size_t i;
delete(this->passwords);
delete(this->users);
delete(this->active_sessions); delete(this->active_sessions);
for (i=0; i<this->nauth; i++) { for (i=0; i<this->nauth; i++) {

8
src/application/signup.c
View File

@ -41,8 +41,8 @@ applicationSignup(
Session session) Session session)
{ {
unsigned char hash_data[SALT_SIZE+HASH_SIZE]; unsigned char hash_data[SALT_SIZE+HASH_SIZE];
unsigned char * salt = hash_data;
unsigned char * hash = hash_data + SALT_SIZE;
unsigned char * salt = NULL;
unsigned char * hash = hash_data+SALT_SIZE;
if (NULL != userLoad(user, this->users)) { if (NULL != userLoad(user, this->users)) {
/* /*
@ -67,6 +67,10 @@ applicationSignup(
return 0; return 0;
} }
memcpy(hash_data, salt, SALT_SIZE);
MEM_FREE(salt);
storagePut( storagePut(
this->passwords, this->passwords,
CRED_PWD(cred).user, CRED_PWD(cred).user,

4
src/auth/storage/storage.c
View File

@ -21,7 +21,7 @@
*/ */
#include "class.h" #include "class.h"
#include "storage.h"
#include "storage/storage.h"
#include "auth.h" #include "auth.h"
#include "commons.h" #include "commons.h"
#include "utils/memory.h" #include "utils/memory.h"
@ -90,6 +90,6 @@ authStorageAuthenticate(void * _this, Credential cred)
INIT_IFACE(Class, authStorageCtor, authStorageDtor, NULL); INIT_IFACE(Class, authStorageCtor, authStorageDtor, NULL);
INIT_IFACE(Auth, authStorageAuthenticate); INIT_IFACE(Auth, authStorageAuthenticate);
CREATE_CLASS(AuthLdap, NULL, IFACE(Class), IFACE(Auth));
CREATE_CLASS(AuthStorage, NULL, IFACE(Class), IFACE(Auth));
// vim: set ts=4 sw=4: // vim: set ts=4 sw=4:

2
src/storage/get.c
View File

@ -25,8 +25,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include "storage.h"
#include "class.h" #include "class.h"
#include "storage/storage.h"
#include "utils/memory.h" #include "utils/memory.h"

2
src/storage/put.c
View File

@ -24,8 +24,8 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include "storage.h"
#include "class.h" #include "class.h"
#include "storage/storage.h"
#include "utils/memory.h" #include "utils/memory.h"

2
src/storage/storage.c
View File

@ -24,8 +24,8 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "storage.h"
#include "class.h" #include "class.h"
#include "storage/storage.h"
#include "utils/memory.h" #include "utils/memory.h"

2
src/storage/update.c
View File

@ -24,8 +24,8 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include "storage.h"
#include "class.h" #include "class.h"
#include "storage/storage.h"
#include "utils/memory.h" #include "utils/memory.h"

32
src/taskrambler.c
View File

@ -140,7 +140,10 @@ main()
default: default:
{ {
AuthLdap ldap;
Storage users;
Storage passwords;
AuthLdap authLdap;
AuthStorage authStorage;
Application application; Application application;
ApplicationAdapterHttp adapterHttp; ApplicationAdapterHttp adapterHttp;
HttpWorker worker; HttpWorker worker;
@ -154,12 +157,27 @@ main()
logger = new(LoggerSyslog, LOGGER_DEBUG); logger = new(LoggerSyslog, LOGGER_DEBUG);
worker = new(HttpWorker, "testserver");
ldap = new(
AuthLdap, "ldap://hosted/", CSTRA(LDAP_BASE));
application = new(Application, value, 1, ldap);
authLdap = new(
AuthLdap,
"ldap://hosted/",
CSTRA(LDAP_BASE));
users = new(Storage, "./run/users.db");
passwords = new(Storage, "./run/passwords.db");
authStorage = new(AuthStorage, passwords);
application = new(
Application,
value,
users,
passwords,
2,
authLdap,
authStorage);
adapterHttp = new(ApplicationAdapterHttp, application); adapterHttp = new(ApplicationAdapterHttp, application);
worker = new(HttpWorker, "testserver");
subjectAttach(worker, adapterHttp); subjectAttach(worker, adapterHttp);
server = new(Server, logger, worker, 11212, SOMAXCONN); server = new(Server, logger, worker, 11212, SOMAXCONN);
@ -210,6 +228,10 @@ main()
delete(worker); delete(worker);
delete(adapterHttp); delete(adapterHttp);
delete(application); delete(application);
delete(authStorage);
delete(passwords);
delete(users);
delete(authLdap);
delete(logger); delete(logger);
clearMimeTypes(); clearMimeTypes();

2
src/user/load.c
View File

@ -24,7 +24,7 @@
#include <string.h> #include <string.h>
#include "user.h" #include "user.h"
#include "storage.h"
#include "storage/storage.h"
#include "class.h" #include "class.h"
#include "utils/memory.h" #include "utils/memory.h"

2
src/user/save.c
View File

@ -24,7 +24,7 @@
#include <string.h> #include <string.h>
#include "user.h" #include "user.h"
#include "storage.h"
#include "storage/storage.h"
#include "class.h" #include "class.h"
#include "utils/memory.h" #include "utils/memory.h"

2
src/user/user.c
View File

@ -21,7 +21,7 @@
*/ */
#include "user.h" #include "user.h"
#include "storage.h"
#include "storage/storage.h"
#include "class.h" #include "class.h"
#include "utils/memory.h" #include "utils/memory.h"

17
src/utils/hash.c
View File

@ -52,21 +52,4 @@ sdbm(const unsigned char * str, size_t len)
return hash; return hash;
} }
/*
* this will use openssl to hash a given password with a given salt.
* If salt is NULL a random salt is generated and returned in salt.
* The memory for this is allocated via memMalloc and has to be freed
* by the caller via MEM_FREE.
* The size of the salt is always SALT_SIZE and that of hash is always
* hash size. Both are defined in auth/storage.h
*/
int
hash_pw(
const char * password,
const size_t npassword,
unsigned char * pw_hash,
unsigned char ** salt)
{
}
// vim: set ts=4 sw=4: // vim: set ts=4 sw=4:
Write Preview
Loading…
Cancel
Save