X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/5c58ad2d1527936b4d30891497eef48bde0fe1f3..7440fd4419acfc9c784f142fb9dee3e64c9a18c2:/pageantc.c

diff --git a/pageantc.c b/pageantc.c
index e718313e..7d840f96 100644
--- a/pageantc.c
+++ b/pageantc.c
@@ -2,113 +2,74 @@
  * Pageant client code.
  */
 
-#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef TESTMODE
-#define debug(x) (printf x)
-#else
-#define debug(x)
-#endif
+#include "putty.h"
 
-int agent_exists(void) {
+#define AGENT_COPYDATA_ID 0x804e50ba   /* random goop */
+#define AGENT_MAX_MSGLEN  8192
+
+#define GET_32BIT(cp) \
+    (((unsigned long)(unsigned char)(cp)[0] << 24) | \
+    ((unsigned long)(unsigned char)(cp)[1] << 16) | \
+    ((unsigned long)(unsigned char)(cp)[2] << 8) | \
+    ((unsigned long)(unsigned char)(cp)[3]))
+
+int agent_exists(void)
+{
     HWND hwnd;
     hwnd = FindWindow("Pageant", "Pageant");
     if (!hwnd)
-        return FALSE;
+	return FALSE;
     else
-        return TRUE;
+	return TRUE;
 }
 
-void agent_query(void *in, int inlen, void **out, int *outlen) {
-#if 0
-#define MAILSLOTNAME "\\\\.\\mailslot\\pageant_listener"
-    SECURITY_ATTRIBUTES sa;
-    HANDLE my_mailslot, agent_mailslot;
-    char name[64];
-    char *p;
-    DWORD msglen, byteswritten, bytesread, inid;
-
-    *out = NULL;
-    *outlen = 0;
-
-    agent_mailslot = CreateFile(MAILSLOTNAME, GENERIC_WRITE,
-                                FILE_SHARE_READ, (LPSECURITY_ATTRIBUTES)NULL,
-                                OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
-                                (HANDLE)NULL);
-    debug(("opened %s: %p\n", MAILSLOTNAME, agent_mailslot));
-    if (agent_mailslot == INVALID_HANDLE_VALUE)
-        return;
-
-    inid = GetCurrentThreadId();
-    inid--;
-
-    sa.nLength = sizeof(sa);
-    sa.lpSecurityDescriptor = NULL;
-    sa.bInheritHandle = TRUE;
-
-    do {
-        sprintf(name, "\\\\.\\mailslot\\pclient_request_%08x", ++inid);
-        /*
-         * Five-minute timeout.
-         */
-        my_mailslot = CreateMailslot(name, 0, 0, &sa);
-        debug(("mailslot %s: %p\n", name, my_mailslot));
-    } while (my_mailslot == INVALID_HANDLE_VALUE);
-    Sleep(3000);
+struct agent_query_data {
+    COPYDATASTRUCT cds;
+    unsigned char *mapping;
+    HANDLE handle;
+    char *mapname;
+    HWND hwnd;
+    void (*callback)(void *, void *, int);
+    void *callback_ctx;
+};
+
+DWORD WINAPI agent_query_thread(LPVOID param)
+{
+    struct agent_query_data *data = (struct agent_query_data *)param;
+    unsigned char *ret;
+    int id, retlen;
 
-    msglen = strlen(name) + 1 + inlen;
-    p = malloc(msglen);
-    if (!p) {
-        CloseHandle(my_mailslot);
-        CloseHandle(agent_mailslot);
-        return;
+    id = SendMessage(data->hwnd, WM_COPYDATA, (WPARAM) NULL,
+		     (LPARAM) &data->cds);
+    ret = NULL;
+    if (id > 0) {
+	retlen = 4 + GET_32BIT(data->mapping);
+	ret = snewn(retlen, unsigned char);
+	if (ret) {
+	    memcpy(ret, data->mapping, retlen);
+	}
     }
+    if (!ret)
+	retlen = 0;
+    UnmapViewOfFile(data->mapping);
+    CloseHandle(data->handle);
+    sfree(data->mapname);
 
-    strcpy(p, name);
-    memcpy(p+strlen(p)+1, in, inlen);
+    agent_schedule_callback(data->callback, data->callback_ctx, ret, retlen);
 
-    debug(("ooh\n"));
-    if (WriteFile(agent_mailslot, p, msglen, &byteswritten, NULL) == 0) {
-        debug(("eek!\n"));
-        free(p);
-        CloseHandle(my_mailslot);
-        CloseHandle(agent_mailslot);
-        return;
-    }
-    debug(("aah\n"));
-    free(p);
-    CloseHandle(agent_mailslot);
+    return 0;
+}
 
-    WaitForSingleObject(my_mailslot, 3000000);
-    debug(("waited\n"));
-    if (!GetMailslotInfo(my_mailslot, NULL, &msglen, NULL, NULL)) {
-        CloseHandle(my_mailslot);
-        return;
-    }
-    if (msglen == MAILSLOT_NO_MESSAGE) {
-        debug(("no message\n"));
-        CloseHandle(my_mailslot);
-        return;
-    }
-    debug(("msglen=%d\n", msglen));
-    p = malloc(msglen);
-    if (!p) {
-        CloseHandle(my_mailslot);
-        return;
-    }
-    if (ReadFile(my_mailslot, p, msglen, &bytesread, NULL) == 0 &&
-        bytesread == msglen) {
-        *out = p;
-        *outlen = msglen;
-    }
-    CloseHandle(my_mailslot);
-#endif
+int agent_query(void *in, int inlen, void **out, int *outlen,
+		void (*callback)(void *, void *, int), void *callback_ctx)
+{
     HWND hwnd;
-    char mapname[64];
+    char *mapname;
     HANDLE filemap;
-    void *p, *ret;
+    unsigned char *p, *ret;
     int id, retlen;
     COPYDATASTRUCT cds;
 
@@ -116,52 +77,57 @@ void agent_query(void *in, int inlen, void **out, int *outlen) {
     *outlen = 0;
 
     hwnd = FindWindow("Pageant", "Pageant");
-    debug(("hwnd is %p\n", hwnd));
     if (!hwnd)
-        return;
-    cds.dwData = 0;                    /* FIXME */
-    cds.cbData = inlen;
-    cds.lpData = in;
-    id = SendMessage(hwnd, WM_COPYDATA, (WPARAM)NULL, (LPARAM)&cds);
-    debug(("return is %d\n", id));
-    if (id > 0) {
-        sprintf(mapname, "PageantReply%08x", id);
-        filemap = OpenFileMapping(FILE_MAP_READ, FALSE, mapname);
-        debug(("name is `%s', filemap is %p\n", mapname, filemap));
-        debug(("error is %d\n", GetLastError()));
-        if (filemap != NULL && filemap != INVALID_HANDLE_VALUE) {
-            p = MapViewOfFile(filemap, FILE_MAP_READ, 0, 0, 0);
-            debug(("p is %p\n", p));
-            if (p) {
-                retlen = *(int *)p;
-                debug(("len is %d\n", retlen));
-                ret = malloc(retlen);
-                if (ret) {
-                    memcpy(ret, ((int *)p) + 1, retlen);
-                    *out = ret;
-                    *outlen = retlen;
-                }
-                UnmapViewOfFile(p);
-            }
-            CloseHandle(filemap);
-        }
-        /* FIXME: tell agent to close its handle too */
+	return 1;		       /* *out == NULL, so failure */
+    mapname = dupprintf("PageantRequest%08x", (unsigned)GetCurrentThreadId());
+    filemap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
+				0, AGENT_MAX_MSGLEN, mapname);
+    if (!filemap)
+	return 1;		       /* *out == NULL, so failure */
+    p = MapViewOfFile(filemap, FILE_MAP_WRITE, 0, 0, 0);
+    memcpy(p, in, inlen);
+    cds.dwData = AGENT_COPYDATA_ID;
+    cds.cbData = 1 + strlen(mapname);
+    cds.lpData = mapname;
+    if (callback != NULL && !(flags & FLAG_SYNCAGENT)) {
+	/*
+	 * We need an asynchronous Pageant request. Since I know of
+	 * no way to stop SendMessage from blocking the thread it's
+	 * called in, I see no option but to start a fresh thread.
+	 * When we're done we'll PostMessage the result back to our
+	 * main window, so that the callback is done in the primary
+	 * thread to avoid concurrency.
+	 */
+	struct agent_query_data *data = snew(struct agent_query_data);
+	DWORD threadid;
+	data->mapping = p;
+	data->handle = filemap;
+	data->mapname = mapname;
+	data->callback = callback;
+	data->callback_ctx = callback_ctx;
+	data->cds = cds;	       /* structure copy */
+	data->hwnd = hwnd;
+	if (CreateThread(NULL, 0, agent_query_thread, data, 0, &threadid))
+	    return 0;
+	sfree(data);
     }
-}
-
-#ifdef TESTMODE
 
-int main(void) {
-    void *msg;
-    int len;
-    int i;
-
-    agent_query("\0\0\0\1\1", 5, &msg, &len);
-    debug(("%d:", len));
-    for (i = 0; i < len; i++)
-        debug((" %02x", ((unsigned char *)msg)[i]));
-    debug(("\n"));
-    return 0;
+    /*
+     * The user either passed a null callback (indicating that the
+     * query is required to be synchronous) or CreateThread failed.
+     * Either way, we need a synchronous request.
+     */
+    id = SendMessage(hwnd, WM_COPYDATA, (WPARAM) NULL, (LPARAM) & cds);
+    if (id > 0) {
+	retlen = 4 + GET_32BIT(p);
+	ret = snewn(retlen, unsigned char);
+	if (ret) {
+	    memcpy(ret, p, retlen);
+	    *out = ret;
+	    *outlen = retlen;
+	}
+    }
+    UnmapViewOfFile(p);
+    CloseHandle(filemap);
+    return 1;
 }
-
-#endif