X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot-firefox.git;a=blobdiff_plain;f=nsHttpMoonshot.cpp;h=0f709ab9b8a6f6db21201a47a92c638881601eab;hp=f377fb793e47424ea06ea62bd3446b0e92823441;hb=5d9cdc0dceeac06331368710d6b406a9491da2fb;hpb=c526e7660c6fe87820aed5dfa798a22efd4071be

diff --git a/nsHttpMoonshot.cpp b/nsHttpMoonshot.cpp
index f377fb7..0f709ab 100644
--- a/nsHttpMoonshot.cpp
+++ b/nsHttpMoonshot.cpp
@@ -174,13 +174,16 @@ nsHttpMoonshot::ChallengeReceived(nsIHttpChannel *httpChannel,
 	if (!session)
 		return(NS_ERROR_OUT_OF_MEMORY);
 	NS_ADDREF(*sessionState = session);
-	*identityInvalid = PR_TRUE;
 	LOG(("nsHttpMoonshot::A new session context established\n"));
     } else {
 	LOG(("nsHttpMoonshot::Still using context from previous request\n"));
-        *identityInvalid = PR_FALSE;
     }
 
+    LOG(("nsHttpMoonshot:: gss_state = %d\n", session->gss_state));
+
+    *identityInvalid =
+	(session->gss_state == GSS_CTX_EMPTY) ? PR_TRUE : PR_FALSE;
+
     return NS_OK;
 }
 
@@ -280,7 +283,6 @@ nsHttpMoonshot::GenerateCredentials_1_9_2(nsIHttpChannel *httpChannel,
    gss_buffer_t  in_token_ptr = GSS_C_NO_BUFFER;
    gss_name_t server;
    nsMoonshotSessionState *session = (nsMoonshotSessionState *) *sessionState;
-   gss_cred_id_t cred = GSS_C_NO_CREDENTIAL;
 
 
    nsCOMPtr<nsIURI> uri;
@@ -408,14 +410,21 @@ nsHttpMoonshot::GenerateCredentials_1_9_2(nsIHttpChannel *httpChannel,
         //}
    }
 
-   /* HACK */
+   if (session->gss_cred == GSS_C_NO_CREDENTIAL)
    {
 	OM_uint32 maj_stat, min_stat;
 	gss_buffer_desc tmp_token;
 	gss_name_t gss_username = GSS_C_NO_NAME;
 	gss_OID_set_desc mechs, *mechsp = GSS_C_NO_OID_SET;
+	const char *p, *u;
+
+	u = strdup(NS_LossyConvertUTF16toASCII(username).get());
+	p = strdup(NS_LossyConvertUTF16toASCII(password).get());
 
-	tmp_token.value = (void *) "steve@local";
+	LOG(("Acquiring credentials for user '%s' using password '%s'\n",
+		                 u, p));
+
+	tmp_token.value = (void *) u;
 	tmp_token.length = strlen((const char *)tmp_token.value);
 	maj_stat = gss_import_name(&min_stat, &tmp_token,
 				   GSS_C_NT_USER_NAME,
@@ -431,21 +440,24 @@ nsHttpMoonshot::GenerateCredentials_1_9_2(nsIHttpChannel *httpChannel,
 	mechs.count = 1;
 	mechsp = &mechs;
 
-	tmp_token.value = (void *)"testing";
-	tmp_token.length = strlen((const char*)tmp_token.value);
+	tmp_token.value = (void *) p;
+	tmp_token.length = strlen(p);//strlen((const char*)tmp_token.value);
 	maj_stat = gss_acquire_cred_with_password(&min_stat,
 						  gss_username, &tmp_token, 0,
 						  mechsp, GSS_C_INITIATE,
-						  &cred, NULL, NULL);
+						  &session->gss_cred, NULL, NULL);
 	if (GSS_ERROR(maj_stat)) {
 	    LogGssError(maj_stat, min_stat, "gss_acquire_cred_with_password()");
 	    session->Reset();
 	    return NS_ERROR_FAILURE;
 	}
+
+	LOG(("Acquired credential for user '%s' using password '%s'\n",
+	     u, p));
    }
 
    major_status = gss_init_sec_context(&minor_status,
-				    cred,
+				    session->gss_cred,
 				    &session->gss_ctx,
 				    server,
 				    GetOID(),
@@ -461,7 +473,7 @@ nsHttpMoonshot::GenerateCredentials_1_9_2(nsIHttpChannel *httpChannel,
    if (GSS_ERROR(major_status)) {
       LogGssError(major_status, minor_status, "gss_init_sec_context() failed");
       (void) gss_release_name(&minor_status, &server);
-      gss_release_cred(&minor_status, &cred);
+//      gss_release_cred(&minor_status, &cred);
       session->Reset();
       if (input_token.length > 0 && input_token.value != NULL)
 	      (void) gss_release_buffer(&minor_status, &input_token);
@@ -497,7 +509,7 @@ nsHttpMoonshot::GenerateCredentials_1_9_2(nsIHttpChannel *httpChannel,
    if (output_token.length == 0) {
       LOG(("No GSS output token to send, exiting"));
       (void) gss_release_name(&minor_status, &server);
-      gss_release_cred(&minor_status, &cred);
+//      gss_release_cred(&minor_status, &cred);
       return NS_ERROR_FAILURE;
    }
 
@@ -512,7 +524,7 @@ nsHttpMoonshot::GenerateCredentials_1_9_2(nsIHttpChannel *httpChannel,
    if (!encoded_token) {
       (void) gss_release_buffer(&minor_status, &output_token);
       (void) gss_release_name(&minor_status, &server);
-      gss_release_cred(&minor_status, &cred);
+//      gss_release_cred(&minor_status, &cred);
       return NS_ERROR_OUT_OF_MEMORY;
    }
 
@@ -524,7 +536,7 @@ nsHttpMoonshot::GenerateCredentials_1_9_2(nsIHttpChannel *httpChannel,
       PR_Free(encoded_token);
       (void) gss_release_buffer(&minor_status, &output_token);
       (void) gss_release_name(&minor_status, &server);
-      gss_release_cred(&minor_status, &cred);
+//      gss_release_cred(&minor_status, &cred);
       return NS_ERROR_OUT_OF_MEMORY;
    }
 
@@ -533,7 +545,7 @@ nsHttpMoonshot::GenerateCredentials_1_9_2(nsIHttpChannel *httpChannel,
 
    (void) gss_release_buffer(&minor_status, &output_token);
    (void) gss_release_name(&minor_status, &server);
-      gss_release_cred(&minor_status, &cred);
+//      gss_release_cred(&minor_status, &cred);
 
    LOG(("returning the call"));