denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed trailing spaces ([[:space:]]+$)

Browse Source
This commit is contained in:
Martin Willi
2009-09-04 13:46:09 +02:00
parent 7d1b030446
commit 7daf5226b7
703 changed files with 10633 additions and 10633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/medsrv/controller/peer_controller.c
+16 -16
View File
@@ -42,8 +42,8 @@ struct private_peer_controller_t {
* active user session
*/
user_t *user;
/**
/**
* underlying database
*/
database_t *db;
@@ -55,19 +55,19 @@ struct private_peer_controller_t {
static void list(private_peer_controller_t *this, request_t *request)
{
enumerator_t *query;
query = this->db->query(this->db,
"SELECT id, alias, keyid FROM peer WHERE user = ? ORDER BY alias",
DB_UINT, this->user->get_user(this->user),
DB_UINT, DB_TEXT, DB_BLOB);
if (query)
{
u_int id;
char *alias;
chunk_t keyid;
identification_t *identifier;
while (query->enumerate(query, &id, &alias, &keyid))
{
request->setf(request, "peers.%d.alias=%s", id, alias);
@@ -89,7 +89,7 @@ static bool verify_alias(private_peer_controller_t *this, request_t *request,
if (!alias || *alias == '\0')
{
request->setf(request, "error=Alias is missing.");
return FALSE;
return FALSE;
}
while (*alias != '\0')
{
@@ -122,7 +122,7 @@ static bool parse_public_key(private_peer_controller_t *this,
{
public_key_t *public;
chunk_t blob, id;
if (!public_key || *public_key == '\0')
{
request->setf(request, "error=Public key is missing.");
@@ -156,7 +156,7 @@ static bool parse_public_key(private_peer_controller_t *this,
static void add(private_peer_controller_t *this, request_t *request)
{
char *alias = "", *public_key = "";
if (request->get_query_data(request, "back"))
{
return request->redirect(request, "peer/list");
@@ -164,10 +164,10 @@ static void add(private_peer_controller_t *this, request_t *request)
while (request->get_query_data(request, "add"))
{
chunk_t encoding, keyid;
alias = request->get_query_data(request, "alias");
public_key = request->get_query_data(request, "public_key");
if (!verify_alias(this, request, alias))
{
break;
@@ -194,7 +194,7 @@ static void add(private_peer_controller_t *this, request_t *request)
}
request->set(request, "alias", alias);
request->set(request, "public_key", public_key);
return request->render(request, "templates/peer/add.cs");
}
@@ -209,7 +209,7 @@ char* pem_encode(chunk_t der)
char *pem;
chunk_t base64;
int i = 0;
base64 = chunk_to_base64(der, NULL);
len = strlen(begin) + base64.len + base64.len/64 + strlen(end) + 2;
pem = malloc(len + 1);
@@ -223,7 +223,7 @@ char* pem_encode(chunk_t der)
}
while (i < base64.len - 2);
strcat(pem, end);
free(base64.ptr);
return pem;
}
@@ -235,7 +235,7 @@ static void edit(private_peer_controller_t *this, request_t *request, int id)
{
char *alias = "", *public_key = "", *pem;
chunk_t encoding, keyid;
if (request->get_query_data(request, "back"))
{
return request->redirect(request, "peer/list");
@@ -253,7 +253,7 @@ static void edit(private_peer_controller_t *this, request_t *request, int id)
{
alias = request->get_query_data(request, "alias");
public_key = request->get_query_data(request, "public_key");
if (!verify_alias(this, request, alias))
{
break;
@@ -333,7 +333,7 @@ static void handle(private_peer_controller_t *this, request_t *request,
{
id = atoi(idstr);
}
if (streq(action, "list"))
{
return list(this, request);
src/medsrv/controller/user_controller.c
+13 -13
View File
@@ -37,12 +37,12 @@ struct private_user_controller_t {
* database connection
*/
database_t *db;
/**
* user session
*/
user_t *user;
/**
* minimum required password lenght
*/
@@ -56,7 +56,7 @@ static chunk_t hash_password(char *login, char *password)
{
hasher_t *hasher;
chunk_t hash, data;
hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1);
if (!hasher)
{
@@ -77,16 +77,16 @@ static void login(private_user_controller_t *this, request_t *request)
if (request->get_query_data(request, "submit"))
{
char *login, *password;
login = request->get_query_data(request, "login");
password = request->get_query_data(request, "password");
if (login && password)
{
enumerator_t *query;
u_int id = 0;
chunk_t hash;
hash = hash_password(login, password);
query = this->db->query(this->db,
"SELECT id FROM user WHERE login = ? AND password = ?",
@@ -126,7 +126,7 @@ static bool verify_login(private_user_controller_t *this, request_t *request,
if (!login || *login == '\0')
{
request->setf(request, "error=Username is missing.");
return FALSE;
return FALSE;
}
while (*login != '\0')
{
@@ -190,13 +190,13 @@ static void add(private_user_controller_t *this, request_t *request)
login = request->get_query_data(request, "new_login");
password = request->get_query_data(request, "new_password");
confirm = request->get_query_data(request, "confirm_password");
if (!verify_login(this, request, login) ||
!verify_password(this, request, password, confirm))
{
break;
}
hash = hash_password(login, password);
if (!hash.ptr || this->db->execute(this->db, &id,
"INSERT INTO user (login, password) VALUES (?, ?)",
@@ -222,7 +222,7 @@ static void edit(private_user_controller_t *this, request_t *request)
{
enumerator_t *query;
char *old_login;
/* lookup old login */
query = this->db->query(this->db, "SELECT login FROM user WHERE id = ?",
DB_INT, this->user->get_user(this->user),
@@ -256,12 +256,12 @@ static void edit(private_user_controller_t *this, request_t *request)
{
char *new_login, *old_pass, *new_pass, *confirm;
chunk_t old_hash, new_hash;
new_login = request->get_query_data(request, "old_login");
old_pass = request->get_query_data(request, "old_password");
new_pass = request->get_query_data(request, "new_password");
confirm = request->get_query_data(request, "confirm_password");
if (!verify_login(this, request, new_login) ||
!verify_password(this, request, new_pass, confirm))
{
@@ -270,7 +270,7 @@ static void edit(private_user_controller_t *this, request_t *request)
}
old_hash = hash_password(old_login, old_pass);
new_hash = hash_password(new_login, new_pass);
if (this->db->execute(this->db, NULL,
"UPDATE user SET login = ?, password = ? "
"WHERE id = ? AND password = ?",
src/medsrv/filter/auth_filter.c
+2 -2
View File
@@ -33,7 +33,7 @@ struct private_auth_filter_t {
* user session
*/
user_t *user;
/**
* database connection
*/
@@ -50,7 +50,7 @@ static bool run(private_auth_filter_t *this, request_t *request,
{
enumerator_t *query;
char *login;
query = this->db->query(this->db, "SELECT login FROM user WHERE id = ?",
DB_INT, this->user->get_user(this->user),
DB_TEXT);
src/medsrv/main.c
+7 -7
View File
@@ -32,14 +32,14 @@ int main(int arc, char *argv[])
bool debug;
char *uri;
int timeout, threads;
library_init(STRONGSWAN_CONF);
if (!lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
lib->settings->get_str(lib->settings, "medsrv.load", PLUGINS)))
{
return 1;
}
socket = lib->settings->get_str(lib->settings, "medsrv.socket", NULL);
debug = lib->settings->get_bool(lib->settings, "medsrv.debug", FALSE);
timeout = lib->settings->get_time(lib->settings, "medsrv.timeout", 900);
@@ -50,14 +50,14 @@ int main(int arc, char *argv[])
fprintf(stderr, "database URI medsrv.database not defined.\n");
return 1;
}
db = lib->db->create(lib->db, uri);
if (db == NULL)
{
fprintf(stderr, "opening database failed.\n");
return 1;
}
dispatcher = dispatcher_create(socket, debug, timeout,
(context_constructor_t)user_create, db);
dispatcher->add_filter(dispatcher,
@@ -66,13 +66,13 @@ int main(int arc, char *argv[])
(controller_constructor_t)user_controller_create, db);
dispatcher->add_controller(dispatcher,
(controller_constructor_t)peer_controller_create, db);
dispatcher->run(dispatcher, threads);
dispatcher->waitsignal(dispatcher);
dispatcher->destroy(dispatcher);
db->destroy(db);
library_deinit();
return 0;
}
src/medsrv/user.h
+3 -3
View File
@@ -25,17 +25,17 @@ typedef struct user_t user_t;
* Per session context. Contains user user state and data.
*/
struct user_t {
/**
* implements context_t interface
*/
context_t context;
/**
* Set the user ID of the logged in user.
*/
void (*set_user)(user_t *this, u_int id);
/**
* Get the user ID of the logged in user.
*/