MODULES: add priorities in execution

[citadel.git] / citadel / modules / openid / serv_openid_rp.c

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index aa03797ef123111aac44925853baf4eccd9275bd..ecb4ef3875eb9c6b6c477224fbb537aa326dcdba 100644 (file)
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -1,7 +1,7 @@
 /*
  * This is an implementation of OpenID 2.0 relying party support in stateless mode.
  *
- * Copyright (c) 2007-2011 by the citadel.org team
+ * Copyright (c) 2007-2012 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -325,29 +325,65 @@ void cmd_oidd(char *argbuf) {
  */
 int openid_create_user_via_ax(StrBuf *claimed_id, HashList *sreg_keys)
 {
-       char *desired_name = NULL;
+       char *nickname = NULL;
+       char *firstname = NULL;
+       char *lastname = NULL;
        char new_password[32];
        long len;
+       const char *Key;
+       void *Value;
 
        if (config.c_auth_mode != AUTHMODE_NATIVE) return(1);
        if (config.c_disable_newu) return(2);
        if (CC->logged_in) return(3);
-       if (!GetHash(sreg_keys, "sreg.nickname", 13, (void *) &desired_name)) return(4);
 
-       syslog(LOG_DEBUG, "The desired account name is <%s>", desired_name);
+       HashPos *HashPos = GetNewHashPos(sreg_keys, 0);
+       while (GetNextHashPos(sreg_keys, HashPos, &len, &Key, &Value) != 0) {
+               syslog(LOG_DEBUG, "%s = %s", Key, (char *)Value);
+
+               if (cbmstrcasestr(Key, "value.nickname") != NULL) {
+                       nickname = (char *)Value;
+               }
+               else if ( (nickname == NULL) && (cbmstrcasestr(Key, "value.nickname") != NULL)) {
+                       nickname = (char *)Value;
+               }
+               else if (cbmstrcasestr(Key, "value.firstname") != NULL) {
+                       firstname = (char *)Value;
+               }
+               else if (cbmstrcasestr(Key, "value.lastname") != NULL) {
+                       lastname = (char *)Value;
+               }
+
+       }
+       DeleteHashPos(&HashPos);
+
+       if (nickname == NULL) {
+               if ((firstname != NULL) || (lastname != NULL)) {
+                       char fullname[1024] = "";
+                       if (firstname) strcpy(fullname, firstname);
+                       if (firstname && lastname) strcat(fullname, " ");
+                       if (lastname) strcat(fullname, lastname);
+                       nickname = fullname;
+               }
+       }
 
-       len = cutuserkey(desired_name);
-       if (!CtdlGetUser(&CC->user, desired_name)) {
-               syslog(LOG_DEBUG, "<%s> is already taken by another user.", desired_name);
+       if (nickname == NULL) {
+               return(4);
+       }
+       syslog(LOG_DEBUG, "The desired account name is <%s>", nickname);
+
+       len = cutuserkey(nickname);
+       if (!CtdlGetUser(&CC->user, nickname)) {
+               syslog(LOG_DEBUG, "<%s> is already taken by another user.", nickname);
                memset(&CC->user, 0, sizeof(struct ctdluser));
                return(5);
        }
 
        /* The desired account name is available.  Create the account and log it in! */
-       if (create_user(desired_name, len, 1)) return(6);
+       if (create_user(nickname, len, 1)) return(6);
 
        /* Generate a random password.
-        * The user doesn't care what the password is since he's using OpenID.
+        * The user doesn't care what the password is since he is using OpenID.
         */
        snprintf(new_password, sizeof new_password, "%08lx%08lx", random(), random());
        CtdlSetPassword(new_password);
@@ -780,7 +816,6 @@ void cmd_oids(char *argbuf) {
                return;
        }
        memset(oiddata, 0, sizeof(ctdl_openid));
-       CCC->openid_data = (void *) oiddata;
 
        ArgBuf = NewStrBufPlain(argbuf, -1);
 
@@ -966,7 +1001,6 @@ void cmd_oidf(char *argbuf) {
 
        HashPos *HashPos = GetNewHashPos(keys, 0);
        while (GetNextHashPos(keys, HashPos, &len, &Key, &Value) != 0) {
-               syslog(LOG_DEBUG, "%s = %s", Key, (char *)Value);
                if (strcasecmp(Key, "mode")) {
                        char k_o_keyname[1024];
                        snprintf(k_o_keyname, sizeof k_o_keyname, "openid.%s", (const char *)Key);
@@ -977,6 +1011,7 @@ void cmd_oidf(char *argbuf) {
                        );
                }
        }
+       DeleteHashPos(&HashPos);
 
        curl = ctdl_openid_curl_easy_init(errmsg);
        curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(oiddata->op_url));
@@ -1094,7 +1129,7 @@ void cmd_oidf(char *argbuf) {
 CTDL_MODULE_INIT(openid_rp)
 {
        if (!threading) {
-               curl_global_init(CURL_GLOBAL_ALL);
+// evcurl call this for us. curl_global_init(CURL_GLOBAL_ALL);
 
                /* Only enable the OpenID command set when native mode authentication is in use. */
                if (config.c_auth_mode == AUTHMODE_NATIVE) {
@@ -1105,7 +1140,7 @@ CTDL_MODULE_INIT(openid_rp)
                        CtdlRegisterProtoHook(cmd_oidc, "OIDC", "Create new user after validating OpenID");
                        CtdlRegisterProtoHook(cmd_oida, "OIDA", "List all OpenIDs in the database");
                }
-               CtdlRegisterSessionHook(openid_cleanup_function, EVT_LOGOUT);
+               CtdlRegisterSessionHook(openid_cleanup_function, EVT_LOGOUT, PRIO_LOGOUT + 10);
                CtdlRegisterUserHook(openid_purge, EVT_PURGEUSER);
                openid_level_supported = 1;     /* This module supports OpenID 1.0 only */
        }