Added bufferevent proxy(socks5&https) support #1514

zakoland · 2023-09-23T14:06:03Z

I found that cannot use proxies(socks5/https) when use evhttp mod.
It will reset existed connection when evhttp open first request. I think that proxy must use connection before http/https first request.But bufferevent can create connection via proxy, because it will not auto reset connection.
So I added support code and unit-test code for proxies,i hope to merge them into the master.
Thank you very mush!

azat

Thank you for your contribution, it does looks interesting!
But the code has some coding style issues that should be resolved first, plus it reads from socket directly.

I thought about this couple of times, but never have time for this, my idea was to provide layer, like evrpc, to provide SOCKS support (or maybe it will be easy to extend evhttp instead).

P.S. sorry for the delay

zakoland · 2023-12-24T08:57:17Z

Thank you for your contribution, it does looks interesting! But the code has some coding style issues that should be resolved first, plus it reads from socket directly.

I thought about this couple of times, but never have time for this, my idea was to provide layer, like evrpc, to provide SOCKS support (or maybe it will be easy to extend evhttp instead).

P.S. sorry for the delay

I've tweaked the coding style and moved the code from the example code to the trunk(master).
I also tried to change the raw-socket read/write to a bufferevent operation, but it was unsuccessful because of ssl request was always sent before the tcp request(proxy handshake).
I really can't deal with the sequence of bev to send proxy handshake.I want some help with the details.

azat

First of all thank you for the effort! I would really love to see SOCKS5 support in libevent!

I've tweaked the coding style

There are still something left, please address all of them.

I also tried to change the raw-socket read/write to a bufferevent operation, but it was unsuccessful because of ssl request was always sent before the tcp request(proxy handshake).
I really can't deal with the sequence of bev to send proxy handshake.I want some help with the details.

Take a look at the comment for evhttp_connection_set_proxy, does this help?

azat · 2024-02-18T19:00:58Z

http.c

+		if (!(evcon->proxy_address = mm_strdup(str_value)))
+			break;
+        // username and password, not support now
+        if ((str_value = evhttp_uri_get_userinfo(uri))){


Should return an error in this case then.

azat · 2024-02-18T19:02:04Z

http.c

+		timeout.tv_sec = 3;
+		FD_ZERO(&w);
+		FD_SET(fd, &w);
+		if (select(fd + 1, NULL, &w, NULL, &timeout) <= 0)


Such code cannot be merged it should be done with a proper non-blocking API via callbacks not select while the data is there.

azat · 2024-02-18T19:02:22Z

http.c

+		}else if (2 == evcon->proxy_type){
+			if (socks5_handshake(fd, evcon->proxy_target_address,evcon->proxy_target_port))
+				break;
+		}else


There are lots of style issues like this in the code

Suggested change

}else

} else

azat · 2024-02-18T19:03:00Z

http.c

@@ -2873,7 +3119,15 @@ evhttp_connection_connect_(struct evhttp_connection *evcon)
 		 */
 		evhttp_connection_cb_cleanup(evcon);
 		return (0);
-	}
+	}else {
+        if (evcon->connectcb != NULL){


There are lots of style coding issues when spaces used instead of tabs:

Suggested change

if (evcon->connectcb != NULL){

if (evcon->connectcb != NULL){

azat · 2024-02-18T19:07:12Z

sample/https-client-proxy.c

+		if (evhttp_connection_set_proxy(evcon,"https://192.168.88.209:8888") < 0)
+		    break;
+		// if (evhttp_connection_set_proxy(evcon,"socks5://192.168.88.1:1920") < 0)
+		//     break;


This cannot be merged, consider adding getopt and support multiple SOCKS types.

azat · 2024-02-18T19:10:41Z

http.c

+        // port
+        evcon->proxy_port = evhttp_uri_get_port(uri);
+        if (evcon->proxy_port == -1)
+            evcon->proxy_port = (strcasecmp(scheme, "https") == 0) ? 443 : 1080;       


There are trailing whitespaces, please cleanup the patch.

azat · 2024-02-18T19:14:45Z

sample/https-client-proxy.c

+			break;
+		if (evhttp_connection_set_proxy(evcon,"https://192.168.88.209:8888") < 0)
+		    break;
+		// if (evhttp_connection_set_proxy(evcon,"socks5://192.168.88.1:1920") < 0)


Does it work now?

azat · 2024-02-18T19:18:50Z

http.c

+}
+
+int 
+evhttp_connection_set_proxy(struct evhttp_connection *evcon, const char* proxystr)


It is not correct to provide such API, since connection can be already in the connected state.
So consider something like evhttp_connection_with_proxy_base_bufferevent_new/evhttp_connection_with_proxy_base_new instead.

And I guess in your comment you were writing that you need to initiate socks5 request without TLS, then you can use plain bufferevent, but not raw operations on sockets.

Once SOCKS5 initialized you can wrap into bufferevent with TLS for https, this can be done with bufferevent_mbedtls_filter_new/bufferevent_openssl_filter_new

Okay, so I was thinking about avoiding too much change, making as few changes as possible to the libevent trunk code. It just as an example to give people who need to make temporary changes to implement the functionality of the proxy.
With your tips, I have the direction of change. I will try to submit it after modification according to your instructions, which may take some time.

azat · 2024-03-03T13:25:36Z

@zakoland are you interested in providing socks support as a separate layer?

I thought about this couple of times, but never have time for this, my idea was to provide layer, like evrpc, to provide SOCKS support (or maybe it will be easy to extend evhttp instead).

zakoland · 2024-03-04T01:30:21Z

@zakoland are you interested in providing socks support as a separate layer?

I thought about this couple of times, but never have time for this, my idea was to provide layer, like evrpc, to provide SOCKS support (or maybe it will be easy to extend evhttp instead).

I'm so Sorry. I didn't notice your reply two weeks ago. I will promptly make the necessary modifications in accordance with your requirements.

zakoland · 2024-04-01T05:13:26Z

@azat

The latest code has been submitted, but I think proxy is not just a requirement for the HTTP subsystem, and buffervent connections can also requests web via proxy. I think that proxy requirements should be modified in the buffervent of the connection layer. Therefore, I added a callback function after establishing TCP to send proxy requests, and then proceeded with SSL and HTTP request sending.
This is just a demo modification that reflects my thoughts and ideas. Some of the code is not yet very complete. If it is determined that such changes are feasible, I will continue to improve the code.
Some technical details still require your suggestions for modification.

zakoland and others added 2 commits September 23, 2023 21:33

add evhttp proxy(socks5/https) support

ee68e35

Merge branch 'master' into master

dbade61

azat approved these changes Nov 26, 2023

View reviewed changes

azat added the subsystem:http HTTP Related issue label Nov 26, 2023

zakoland added 3 commits December 22, 2023 11:28

Merge remote-tracking branch 'upstream/master'

2322291

Merge branch 'master' of https://github.com/zakoland/libevent

1ebc08d

Code styles and functions

26d3eb9

zakoland requested a review from azat December 24, 2023 08:46

azat reviewed Feb 18, 2024

View reviewed changes

azat marked this pull request as draft March 3, 2024 13:25

zakoland added 2 commits April 1, 2024 00:54

Merge remote-tracking branch 'upstream/master'

b955f82

bev demo for socks5 and https proxy

38c9b75

zakoland changed the title ~~add evhttp proxy(socks5/https) support~~ add bufferevent proxy(socks5/https) support May 8, 2024

zakoland changed the title ~~add bufferevent proxy(socks5/https) support~~ Added bufferevent proxy(socks5/https) support May 8, 2024

zakoland changed the title ~~Added bufferevent proxy(socks5/https) support~~ Added bufferevent proxy(socks5&https) support May 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added bufferevent proxy(socks5&https) support #1514

Added bufferevent proxy(socks5&https) support #1514

zakoland commented Sep 23, 2023 •

edited

azat left a comment

zakoland commented Dec 24, 2023

azat left a comment •

edited

azat Feb 18, 2024

azat Feb 18, 2024

azat Feb 18, 2024

azat Feb 18, 2024

azat Feb 18, 2024

azat Feb 18, 2024

azat Feb 18, 2024

azat Feb 18, 2024

zakoland Mar 4, 2024 •

edited

azat commented Mar 3, 2024

zakoland commented Mar 4, 2024

zakoland commented Apr 1, 2024 •

edited

	if (evcon->connectcb != NULL){
	if (evcon->connectcb != NULL){

Added bufferevent proxy(socks5&https) support #1514

Are you sure you want to change the base?

Added bufferevent proxy(socks5&https) support #1514

Conversation

zakoland commented Sep 23, 2023 • edited

azat left a comment

Choose a reason for hiding this comment

zakoland commented Dec 24, 2023

azat left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zakoland Mar 4, 2024 • edited

Choose a reason for hiding this comment

azat commented Mar 3, 2024

zakoland commented Mar 4, 2024

zakoland commented Apr 1, 2024 • edited

zakoland commented Sep 23, 2023 •

edited

azat left a comment •

edited

zakoland Mar 4, 2024 •

edited

zakoland commented Apr 1, 2024 •

edited