From 7b1259811f24bd997fbcf8db7e9d157b6cea2ff5 Mon Sep 17 00:00:00 2001
From: Steven Engler <opara@cs.georgetown.edu>
Date: Wed, 15 Sep 2021 14:16:14 -0400
Subject: [PATCH] Support tor-specific socks error messages

The socks port 'ExtendedErrors' flag must be set in the tor
configuration for tor to return these error codes.
---
 src/tgen-transport.c | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/tgen-transport.c b/src/tgen-transport.c
index 188eca3..3b98860 100644
--- a/src/tgen-transport.c
+++ b/src/tgen-transport.c
@@ -1062,7 +1062,7 @@ static TGenEvent _tgentransport_receiveSocksResponseStatus(TGenTransport* transp
         return TGEN_EVENT_READ;
     } else {
         gchar version = transport->socksBuffer->str[0];
-        gchar status = transport->socksBuffer->str[1];
+        guchar status = transport->socksBuffer->str[1];
 
         g_string_free(transport->socksBuffer, TRUE);
         transport->socksBuffer = NULL;
@@ -1087,7 +1087,9 @@ static TGenEvent _tgentransport_receiveSocksResponseStatus(TGenTransport* transp
                 g_string_append_printf(messageBuffer, "our request was not granted by "
                         "the SOCKS server: error status %X: ", status);
 
-                /* error codes: https://en.wikipedia.org/wiki/SOCKS#SOCKS5 */
+                /* error codes: https://en.wikipedia.org/wiki/SOCKS#SOCKS5
+                 * we also include non-standard tor error codes, which could potentially have a
+                 * different meaning for non-tor clients */
                 switch(status) {
                     case 0x01: {
                         g_string_append_printf(messageBuffer, "general failure");
@@ -1121,6 +1123,38 @@ static TGenEvent _tgentransport_receiveSocksResponseStatus(TGenTransport* transp
                         g_string_append_printf(messageBuffer, "address type not supported");
                         break;
                     }
+                    case 0xF0: {
+                        g_string_append_printf(messageBuffer, "(tor) onion service descriptor can not be found");
+                        break;
+                    }
+                    case 0xF1: {
+                        g_string_append_printf(messageBuffer, "(tor) onion service descriptor is invalid");
+                        break;
+                    }
+                    case 0xF2: {
+                        g_string_append_printf(messageBuffer, "(tor) onion service introduction failed");
+                        break;
+                    }
+                    case 0xF3: {
+                        g_string_append_printf(messageBuffer, "(tor) onion service rendezvous failed");
+                        break;
+                    }
+                    case 0xF4: {
+                        g_string_append_printf(messageBuffer, "(tor) onion service missing client authorization");
+                        break;
+                    }
+                    case 0xF5: {
+                        g_string_append_printf(messageBuffer, "(tor) onion service wrong client authorization");
+                        break;
+                    }
+                    case 0xF6: {
+                        g_string_append_printf(messageBuffer, "(tor) onion service invalid address");
+                        break;
+                    }
+                    case 0xF7: {
+                        g_string_append_printf(messageBuffer, "(tor) onion service introduction timed out");
+                        break;
+                    }
                     default: {
                         g_string_append_printf(messageBuffer, "unknown error");
                         break;