more detail logging on login

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5743 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/c-apps/oils_auth.c b/Open-ILS/src/c-apps/oils_auth.c
index 02d98e1..c6c57f2 100644 (file)
--- a/Open-ILS/src/c-apps/oils_auth.c
+++ b/Open-ILS/src/c-apps/oils_auth.c
@@ -260,7 +260,7 @@ double oilsAuthGetTimeout( jsonObject* userObj, char* type, double orgloc ) {
  * Event must be freed
  */
 oilsEvent* oilsAuthHandleLoginOK( 
-               jsonObject* userObj, char* uname, char* type, double orgloc ) { 
+               jsonObject* userObj, char* uname, char* type, double orgloc, char* workstation ) { 
                
        oilsEvent* response;
 
@@ -284,7 +284,9 @@ oilsEvent* oilsAuthHandleLoginOK(
        char* authKey = va_list_to_string( 
                        "%s%s", OILS_AUTH_CACHE_PRFX, authToken ); 
 
-       osrfLogActivity(OSRF_LOG_MARK,  "User %s successfully logged in: %s", uname, authToken );
+       char* ws = (workstation) ? workstation : "";
+       osrfLogActivity(OSRF_LOG_MARK,  
+               "successful login: username=%s, authtoken=%s, workstation=%s", uname, authToken, ws );
 
        oilsFMSetString( userObj, "passwd", "" );
        jsonObject* cacheObj = jsonParseStringFmt("{\"authtime\": %lf}", timeout);
@@ -353,6 +355,8 @@ int oilsAuthComplete( osrfMethodContext* ctx ) {
        char* workstation               = jsonObjectGetString(jsonObjectGetKey(args, "workstation"));
        char* barcode                   = jsonObjectToSimpleString(jsonObjectGetKey(args, "barcode"));
 
+       char* ws = (workstation) ? workstation : "";
+
 
        if(!type) type = OILS_AUTH_STAFF;
 
@@ -370,6 +374,7 @@ int oilsAuthComplete( osrfMethodContext* ctx ) {
        
        if(!userObj) { 
                response = oilsNewEvent( OSRF_LOG_MARK, OILS_EVENT_AUTH_FAILED );
+               osrfLogInfo(OSRF_LOG_MARK,  "failed login: username=%s, barcode=%s, workstation=%s", uname, barcode, ws );
                osrfAppRespondComplete( ctx, oilsEventToJSON(response) ); 
                oilsEventFree(response);
                free(barcode);
@@ -435,12 +440,18 @@ int oilsAuthComplete( osrfMethodContext* ctx ) {
                free(orgid);
        }
 
+       int freeuname = 0;
+       if(!uname) {
+               uname = oilsFMGetString( userObj, "usrname" ); 
+               freeuname = 1;
+       }
+
        if( passOK ) {
-               response = oilsAuthHandleLoginOK( userObj, uname, type, orgloc );
+               response = oilsAuthHandleLoginOK( userObj, uname, type, orgloc, workstation );
 
        } else {
                response = oilsNewEvent( OSRF_LOG_MARK, OILS_EVENT_AUTH_FAILED );
-               osrfLogInfo(OSRF_LOG_MARK,  "Login failed for for %s", uname );
+               osrfLogInfo(OSRF_LOG_MARK,  "failed login: username=%s, barcode=%s, workstation=%s", uname, barcode, ws );
        }
 
        jsonObjectFree(userObj);
@@ -448,6 +459,8 @@ int oilsAuthComplete( osrfMethodContext* ctx ) {
        oilsEventFree(response);
        free(barcode);
 
+       if(freeuname) free(uname);
+
        return 0;
 }