Merge pull request #196 from EionRobb/websocket-updates

dylex · web-flow · commit 4760d8f3b2cf · 2025-07-07T13:28:01.000-04:00
Fix a couple of websocket crashes.
diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
@@ -0,0 +1,87 @@
+name: Cross compile for Windows
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+      attestations: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up MinGW
+        run: |
+          sudo apt update
+          sudo apt install -y gcc-mingw-w64-i686-win32
+
+      - name: Load Pidgin from cache
+        id: pidgin-cache
+        uses: actions/cache@v4
+        with:
+          path: pidgin
+          key: pidgin-2.10.11
+      
+      - name: Download Pidgin
+        if: steps.pidgin-cache.outputs.cache-hit != 'true'
+        run: |
+          curl --http1.1 -L https://sourceforge.net/projects/pidgin/files/Pidgin/2.10.11/pidgin-2.10.11.tar.bz2/download -o pidgin.tar.bz2
+          tar -xf pidgin.tar.bz2
+          mv pidgin-2.10.11 pidgin
+          curl --http1.1 -L https://sourceforge.net/projects/pidgin/files/Pidgin/2.10.11/pidgin-2.10.11-win32-bin.zip/download -o pidgin-win32bin.zip
+          unzip pidgin-win32bin.zip
+          cp pidgin-2.10.11-win32bin/libpurple.dll pidgin/libpurple/
+      
+      - name: Load Win32 deps from cache
+        id: win32-cache
+        uses: actions/cache@v4
+        with:
+          path: win32-dev
+          key: win32-dev
+      
+      - name: Setup WinPidgin build
+        if: steps.win32-cache.outputs.cache-hit != 'true'
+        run: |
+          mkdir win32-dev
+          curl --http1.1 -L https://download.gnome.org/binaries/win32/glib/2.28/glib-dev_2.28.8-1_win32.zip -o glib-dev.zip
+          unzip glib-dev.zip -d win32-dev/glib-2.28.8
+          curl --http1.1 -L https://download.gnome.org/binaries/win32/dependencies/gettext-runtime-dev_0.18.1.1-2_win32.zip -o gettext-runtime.zip
+          unzip gettext-runtime.zip -d win32-dev/glib-2.28.8
+          curl --http1.1 -L https://download.gnome.org/binaries/win32/dependencies/zlib-dev_1.2.5-2_win32.zip -o zlib-dev.zip
+          unzip zlib-dev.zip -d win32-dev/glib-2.28.8
+
+          ls win32-dev/
+
+      - name: make
+        run: |
+          export WIN32_CC=i686-w64-mingw32-gcc
+          export WIN32_DEV_TOP=win32-dev
+          export PIDGIN_TREE_TOP=pidgin
+          make libslack.dll
+
+      - name: archive
+        if: ${{ !env.ACT }}
+        uses: actions/upload-artifact@v4
+        with: 
+            name: plugin 
+            path: lib*.dll
+
+      - name: release
+        if: ${{ !env.ACT }}
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: lib*.dll
+          tag: nightly-${{ github.sha }}
+          name: Nightly ${{ github.sha }}
+          allowUpdates: true
+          makeLatest: true
+
+      - name: attest
+        if: ${{ !env.ACT }}
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-path: lib*.dll
diff --git a/.github/workflows/linux-arm64.yml b/.github/workflows/linux-arm64.yml
@@ -0,0 +1,52 @@
+name: Linux ARM64
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-24.04-arm
+    permissions:
+      id-token: write
+      contents: write
+      attestations: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install deps
+        run: |
+          sudo apt update
+          sudo apt install -y libglib2.0-dev gettext
+          # We only need these to build, not to run.  Skip the dependency check.
+          sudo apt download libpurple0t64 libpurple-dev
+          sudo dpkg --force-depends -i libpurple0t64*.deb libpurple-dev*.deb
+
+      - name: make
+        run: |
+          make
+          file libslack.so
+          mv libslack.so libslack_arm64.so
+
+      - name: archive
+        if: ${{ !env.ACT }}
+        uses: actions/upload-artifact@v4
+        with: 
+            name: plugin 
+            path: lib*.so
+
+      - name: release
+        if: ${{ !env.ACT }}
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: lib*.so
+          tag: nightly-${{ github.sha }}
+          name: Nightly ${{ github.sha }}
+          allowUpdates: true
+          makeLatest: true
+
+      - name: attest
+        if: ${{ !env.ACT }}
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-path: lib*.so
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -0,0 +1,48 @@
+name: Linux
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+      attestations: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install deps
+        run: |
+          sudo apt update
+          sudo apt install -y libglib2.0-dev gettext
+          # We only need these to build, not to run.  Skip the dependency check.
+          sudo apt download libpurple0t64 libpurple-dev
+          sudo dpkg --force-depends -i libpurple0t64*.deb libpurple-dev*.deb
+      - name: make
+        run: make
+
+      - name: archive
+        if: ${{ !env.ACT }}
+        uses: actions/upload-artifact@v4
+        with: 
+            name: plugin 
+            path: lib*.so
+
+      - name: release
+        if: ${{ !env.ACT }}
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: lib*.so
+          tag: nightly-${{ github.sha }}
+          name: Nightly ${{ github.sha }}
+          allowUpdates: true
+          makeLatest: true
+
+      - name: attest
+        if: ${{ !env.ACT }}
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-path: lib*.so
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ jobs:
     name: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: sudo apt-get install libpurple-dev
       - name: make
         #env:
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ endif
 CC = $(WIN32_DEV_TOP)/mingw-4.7.2/bin/gcc
 
 DATA_ROOT_DIR_PURPLE:="$(PROGFILES32)/Pidgin"
-PLUGIN_DIR_PURPLE:="$(DATA_ROOT_DIR_PURPLE)/plugins"
+PLUGIN_DIR_PURPLE:="$(PROGFILES32)/Pidgin/plugins"
 CFLAGS = \
     -g \
     -O2 \
@@ -88,7 +88,7 @@ json.%: json-parser/json.%
 $(LIBNAME): $(C_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
-.PHONY: install install-user
+.PHONY: install install-user install-win32
 install: $(LIBNAME)
 	install -d $(PLUGIN_DIR_PURPLE)
 	install $(LIBNAME) $(PLUGIN_DIR_PURPLE)
@@ -97,6 +97,12 @@ install: $(LIBNAME)
 		install -m 0644 img/slack$$z.png $(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/$$z/slack.png ; \
 	done
 
+install-win32: $(LIBNAME)
+	install $(LIBNAME) $(PLUGIN_DIR_PURPLE)
+	for z in 16 22 48 ; do \
+		install -m 0644 img/slack$$z.png $(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/$$z/slack.png ; \
+	done
+
 install-user: $(LIBNAME)
 	install -d $(HOME)/.purple/plugins
 	install $(LIBNAME) $(HOME)/.purple/plugins
diff --git a/purple-websocket.c b/purple-websocket.c
@@ -68,19 +68,19 @@ static inline guchar *buffer_incr(struct buffer *b, size_t n) {
 }
 
 void purple_websocket_abort(PurpleWebsocket *ws) {
+	if (ws == NULL)
+		return;
+	
 	if (ws->ssl_connection != NULL)
 		purple_ssl_close(ws->ssl_connection);
 
 	if (ws->connection != NULL)
 		purple_proxy_connect_cancel(ws->connection);
 
-	purple_debug_misc("websocket", "removing input %d\n", ws->inpa);
+	purple_debug_misc("websocket", "removing input %u\n", ws->inpa);
 	if (ws->inpa > 0)
 		purple_input_remove(ws->inpa);
 
-	if (ws->fd >= 0)
-		close(ws->fd);
-
 	g_free(ws->key);
 	g_free(ws->output.buf);
 	g_free(ws->input.buf);
@@ -105,6 +105,7 @@ static const char *skip_lws(const char *s) {
 					s += 3;
 					break;
 				}
+				return NULL;
 			case '\n':
 			case '\0':
 				return NULL;
@@ -129,11 +130,11 @@ static const char *find_header_content(const char *data, const char *name) {
 
 static gboolean ws_read_headers(PurpleWebsocket *ws, const char *headers) {
 	const char *upgrade = skip_lws(find_header_content(headers, "Upgrade"));
-	if (upgrade && (g_ascii_strncasecmp(upgrade, "websocket", 9) || skip_lws(upgrade+9)))
+	if (upgrade && (g_ascii_strncasecmp(upgrade, "websocket", 9) != 0 || skip_lws(upgrade+9)))
 		upgrade = NULL;
 
 	const char *connection = find_header_content(headers, "Connection");
-	while ((connection = skip_lws(connection)) && g_ascii_strncasecmp(connection, "Upgrade", 7))
+	while ((connection = skip_lws(connection)) && g_ascii_strncasecmp(connection, "Upgrade", 7) != 0)
 		while (*connection++ != ',' && (connection = skip_lws(connection)));
 	if (connection) {
 		const char *e = skip_lws(connection+7);
@@ -150,14 +151,14 @@ static gboolean ws_read_headers(PurpleWebsocket *ws, const char *headers) {
 		g_free(k);
 		gchar *b = g_base64_encode(s, l);
 		l = strlen(b);
-		if (strncmp(accept, b, l) || skip_lws(accept+l))
+		if (strncmp(accept, b, l) != 0 || skip_lws(accept+l))
 			accept = NULL;
 		g_free(b);
 	}
 
 	/* TODO: Sec-WebSocket-Extensions, Sec-WebSocket-Protocol */
 
-	if (strncmp(headers, "HTTP/1.1 101 ", 13) || !upgrade || !connection || !accept) {
+	if (strncmp(headers, "HTTP/1.1 101 ", 13) != 0 || !upgrade || !connection || !accept) {
 		ws_error(ws, headers);
 		return FALSE;
 	}
@@ -249,6 +250,7 @@ static size_t ws_read_message(PurpleWebsocket *ws) {
 					break;
 				default:
 					ws_error(ws, "Unknown frame op");
+					return 0;
 			}
 			return off;
 		}
@@ -281,7 +283,7 @@ static gboolean ws_input(PurpleWebsocket *ws) {
 		return FALSE;
 	}
 
-	if (cond)
+	if (cond != 0)
 		ws->inpa = purple_input_add(ws->fd, cond, ws_input_cb, ws);
 	return TRUE;
 }
@@ -290,9 +292,9 @@ static void ws_input_cb(gpointer data, G_GNUC_UNUSED gint source, PurpleInputCon
 	PurpleWebsocket *ws = data;
 
 	if (cond & PURPLE_INPUT_WRITE) {
-		ssize_t len = ws->output.off >= ws->output.len ? 0 :
+		gssize len = ws->output.off >= ws->output.len ? 0 :
 			ws->ssl_connection
-			? (ssize_t)purple_ssl_write(ws->ssl_connection, ws->output.buf + ws->output.off, ws->output.len - ws->output.off)
+			? purple_ssl_write(ws->ssl_connection, ws->output.buf + ws->output.off, ws->output.len - ws->output.off)
 			: write(ws->fd, ws->output.buf + ws->output.off, ws->output.len - ws->output.off);
 
 		if (len < 0) {
@@ -315,8 +317,8 @@ static void ws_input_cb(gpointer data, G_GNUC_UNUSED gint source, PurpleInputCon
 
 	while (cond & PURPLE_INPUT_READ) {
 		g_return_if_fail(ws->input.off < ws->input.len);
-		ssize_t len = ws->ssl_connection
-			? (ssize_t)purple_ssl_read(ws->ssl_connection, ws->input.buf + ws->input.off, ws->input.siz - ws->input.off)
+		gssize len = ws->ssl_connection
+			? purple_ssl_read(ws->ssl_connection, ws->input.buf + ws->input.off, ws->input.siz - ws->input.off)
 			: read(ws->fd, ws->input.buf + ws->input.off, ws->input.siz - ws->input.off);
 
 		if (len < 0) {
@@ -382,6 +384,7 @@ static void ws_input_cb(gpointer data, G_GNUC_UNUSED gint source, PurpleInputCon
 }
 
 void purple_websocket_send(PurpleWebsocket *ws, PurpleWebsocketOp op, const guchar *msg, size_t len) {
+	g_return_if_fail(ws);
 	g_return_if_fail(ws->connected && !(ws->closed & PURPLE_INPUT_WRITE));
 	g_return_if_fail(!(op & ~WS_OP_MASK));
 	gboolean buf = ws->output.len;
