mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

When changing Passwords, if there are multiple tokens, then ask the 

user to select the token first. Plus other fixes/ compiler warning cleanups.
This commit is contained in:
javi%netscape.com 2000-08-23 23:52:34 +00:00
Родитель ca60525047
Коммит a87ec1bdf4
5 изменённых файлов: 94 добавлений и 1352 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
security/psm/server/minihttp.h
Просмотреть файл

@ -128,6 +128,9 @@ typedef struct SSMHTTPParamMultValuesStr{
/* Typedef for a command handler. */
typedef SSMStatus (*SSMCommandHandlerFunc)(HTTPRequest *req);
/*Quick macro for getting the target from a HTTP Request*/
#define REQ_TARGET(req) ((req)->target) ? (req)->target : &((req)->ctrlconn->super.super)
/* Register a command handler. */
SSMStatus SSM_HTTPRegisterCommandHandler(const char *name,
SSMCommandHandlerFunc func);

1320
security/psm/server/oldfunc.c
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

5
security/psm/server/p7dconn.c
Просмотреть файл

@ -294,7 +294,6 @@ void SSMP7DecodeConnection_ServiceThread(void * arg)
read = LINESIZE; /* set the read size to the default line size */
rv = SSMDataConnection_ReadFromSocket(SSMDATACONNECTION(conn),
(PRInt32*)&read, buffer);
if (read > 0) {
/* there is data, pass it along to PKCS7 */
SSM_DEBUG("Received %ld bytes of data for decoder.\n", read);
@ -482,6 +481,7 @@ void SSMP7DecodeConnection_ContentCallback(void *arg,
SSMStatus rv;
SSMP7DecodeConnection *conn = (SSMP7DecodeConnection *)arg;
PRIntn sent = 0;
PRInt32 osErr;
SSM_DEBUG("writing data to socket.\n");
PR_ASSERT(SSMDATACONNECTION(conn)->m_clientSocket != NULL);
@ -489,7 +489,8 @@ void SSMP7DecodeConnection_ContentCallback(void *arg,
(PRIntn)len, 0, PR_INTERVAL_NO_TIMEOUT);
if (sent != (PRIntn)len) {
rv = PR_GetError();
SSM_DEBUG("error writing data: %d \n", rv);
osErr = PR_GetOSError();
SSM_DEBUG("error writing data: %d OS error: %d\n", rv, osErr);
}
}

106
security/psm/server/password.c
Просмотреть файл

@ -608,9 +608,12 @@ ssm_GetSlotWithPwd(PK11SlotList * slotlist, PK11SlotListElement * current,
next = PK11_GetFirstSafe(slotlist);
else
next = PK11_GetNextSafe(slotlist, current, PR_FALSE);
while (next && PK11_NeedUserInit(next->slot) && !PK11_NeedLogin(next->slot))
while (next &&
PK11_NeedUserInit(next->slot) &&
!PK11_NeedLogin(next->slot) )
next = PK11_GetNextSafe(slotlist, next, PR_FALSE);
return next;
}
@ -627,6 +630,55 @@ ssm_NumSlotsWithPassword(PK11SlotList * slotList)
return numslots;
}
char*
SSM_GetSlotNameForPasswordChange(HTTPRequest * req)
{
PK11SlotList *slotList = NULL;
PK11SlotInfo *slot=NULL;
PK11SlotListElement *listElem = NULL;
SSMResource *target;
char *slotName=NULL;
SSMStatus rv;
slotName = NULL;
target = REQ_TARGET(req);
slotList = PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_TRUE,
PR_TRUE, target);
if (!slotList || !slotList->head)
goto loser;
if (ssm_NumSlotsWithPassword(slotList)>1) {
char * mech = PR_smprintf("mech=%d&unused1=unused1&unused2=unused2",
CKM_INVALID_MECHANISM);
SSM_LockUIEvent(target);
rv = SSMControlConnection_SendUIEvent(req->ctrlconn,
"get", "select_token",
target,mech,
&target->m_clientContext,
PR_TRUE);
SSM_WaitUIEvent(target, PR_INTERVAL_NO_TIMEOUT);
slot = (PK11SlotInfo *) target->m_uiData;
if (!slot)
goto loser;
} else {
listElem = ssm_GetSlotWithPwd(slotList, NULL, PR_TRUE);
slot = listElem->slot;
}
if (!slot) {
goto loser;
}
slotName = PK11_GetTokenName(slot);
PK11_FreeSlot(slot);
PK11_FreeSlotList(slotList);
return PL_strdup(slotName);
loser:
if (slot)
PK11_FreeSlot(slot);
if (slotList)
PK11_FreeSlotList(slotList);
return NULL;
}
SSMStatus SSM_ReSetPasswordKeywordHandler(SSMTextGenContext * cx)
{
char * slotname = NULL;
@ -646,27 +698,15 @@ SSMStatus SSM_ReSetPasswordKeywordHandler(SSMTextGenContext * cx)
if (!slotname || strcmp(slotname, "")== 0)
slot = PK11_GetInternalKeySlot();
else if (strcmp(slotname, "all") == 0) {
/* ask user */
slotList = PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_TRUE, PR_TRUE, target);
if (!slotList || !slotList->head)
goto loser;
if (ssm_NumSlotsWithPassword(slotList)>1) {
char * mech = PR_smprintf("mech=%d&unused1=unused1&unused2=unused2",CKM_INVALID_MECHANISM);
SSM_LockUIEvent(target);
rv = SSMControlConnection_SendUIEvent(cx->m_request->ctrlconn,
"get", "select_token",
target,mech,
&target->m_clientContext, PR_TRUE);
SSM_WaitUIEvent(target, PR_INTERVAL_NO_TIMEOUT);
slot = (PK11SlotInfo *) target->m_uiData;
if (!slot)
char *userSlotName = NULL;
/* ask user */
userSlotName = SSM_GetSlotNameForPasswordChange(cx->m_request);
if (!userSlotName)
goto cancel;
} else {
/* only one interesting slot in the list */
el = ssm_GetSlotWithPwd(slotList, NULL, PR_TRUE);
slot = el->slot;
}
}
slot = PK11_FindSlotByName(userSlotName);
PR_Free(userSlotName);
}
else
slot = PK11_FindSlotByName(slotname);
if (!slot) {
@ -923,6 +963,8 @@ SSMStatus SSM_ProcessPasswordWindow(HTTPRequest * req)
{
SSMStatus rv = SSM_FAILURE;
SSMResource * target = NULL;
char *slotName = NULL, *slotHTMLName = NULL;
char *extraParams = NULL;
if (!req || !req->ctrlconn)
goto loser;
@ -932,18 +974,32 @@ SSMStatus SSM_ProcessPasswordWindow(HTTPRequest * req)
*/
rv = SSM_HTTPReportError(req, HTTP_NO_CONTENT);
target = (req->target ? req->target : (SSMResource *) req->ctrlconn);
/* First let's figure out if there are more than one token installed,
* if so ask the user which one to change the password on
*/
slotName = SSM_GetSlotNameForPasswordChange(req);
/* send UI event to bring up the dialog */
SSM_LockUIEvent(&req->ctrlconn->super.super);
if (slotName == NULL) {
goto loser;
}
slotHTMLName = SSM_ConvertStringToHTMLString(slotName);
PR_FREEIF(slotName);
if (slotHTMLName == NULL) {
goto loser;
}
extraParams = PR_smprintf("slot=%s&mech=1", slotHTMLName);
SSM_LockUIEvent(target);
rv = SSMControlConnection_SendUIEvent(req->ctrlconn, "get",
"set_password", target,
"slot=all&mech=1",
extraParams,
&target->m_clientContext,
PR_TRUE);
PR_FREEIF(extraParams);
if (rv != SSM_SUCCESS) {
SSM_UnlockUIEvent(&req->ctrlconn->super.super);
goto loser;
}
SSM_WaitUIEvent(&req->ctrlconn->super.super, PR_INTERVAL_NO_TIMEOUT);
SSM_WaitUIEvent(target, PR_INTERVAL_NO_TIMEOUT);
loser:
return rv;
}

12
security/psm/server/sslconn.c
Просмотреть файл

@ -958,7 +958,6 @@ loser:
return PR_FAILURE;
}
/* thread function */
/* SSL connection is serviced by the data service thread that works on
* the client data socket and the SSL socket.
@ -979,8 +978,8 @@ void SSM_SSLDataServiceThread(void* arg)
int i;
PRIntn read = 0;
PRIntn sent = 0;
char **outbound = NULL;
char **inbound = NULL;
char *outbound = NULL;
char *inbound = NULL;
PRIntn oBufSize;
SSM_RegisterNewThread("ssl data", (SSMResource *) arg);
@ -994,11 +993,11 @@ void SSM_SSLDataServiceThread(void* arg)
SSMDATACONNECTION(conn)->m_dataServiceThread = PR_GetCurrentThread();
/* initialize xfer buffers */
outbound = (char **) PR_CALLOC(READSSL_CHUNKSIZE+1);
outbound = (char *) PR_CALLOC(READSSL_CHUNKSIZE+1);
if (outbound == NULL)
goto loser;
inbound = (char **) PR_CALLOC(READSSL_CHUNKSIZE+1);
inbound = (char *) PR_CALLOC(READSSL_CHUNKSIZE+1);
if (inbound == NULL)
goto loser;
@ -1204,6 +1203,9 @@ void SSM_SSLDataServiceThread(void* arg)
else {
/* Got data, write it to the client socket */
SSM_DEBUG("Writing to client socket.\n");
#ifdef DEBUG_javi
SSM_DumpBuffer(inbound, read);
#endif
sent = PR_Send(SSMDATACONNECTION(conn)->m_clientSocket,
inbound, read, 0,
PR_INTERVAL_NO_TIMEOUT);