Add native System2HTTPRequest.SetProxy

natives/HTTPRequest.cpp

@@ -31,7 +31,7 @@ HTTPRequest::HTTPRequest(std::string url, std::shared_ptr<CallbackFunction_t> re
 
 HTTPRequest::HTTPRequest(const HTTPRequest &request) :
     Request(request), bodyData(request.bodyData), headers(request.headers), userAgent(request.userAgent),
-    username(request.username), password(request.password), followRedirects(request.followRedirects) {}
+    username(request.username), password(request.password), proxy(request.proxy), proxyAuth(request.proxyAuth), followRedirects(request.followRedirects) {}
 
 
 HTTPRequest *HTTPRequest::Clone() const {

natives/HTTPRequest.h

@@ -38,6 +38,8 @@ class HTTPRequest : public Request {
     std::string userAgent;
     std::string username;
     std::string password;
+    std::string proxy;
+    std::string proxyAuth;
     bool followRedirects;
 
     HTTPRequest(std::string url, std::shared_ptr<CallbackFunction_t> responseCallbackFunction);

natives/Natives.h

@@ -58,6 +58,7 @@ cell_t NativeHTTPRequest_DELETE(IPluginContext *pContext, const cell_t *params);
 cell_t NativeHTTPRequest_HEAD(IPluginContext *pContext, const cell_t *params);
 cell_t NativeHTTPRequest_GetFollowRedirects(IPluginContext *pContext, const cell_t *params);
 cell_t NativeHTTPRequest_SetFollowRedirects(IPluginContext *pContext, const cell_t *params);
+cell_t NativeHTTPRequest_SetProxy(IPluginContext *pContext, const cell_t *params);
 
 cell_t NativeFTPRequest_FTPRequest(IPluginContext *pContext, const cell_t *params);
 cell_t NativeFTPRequest_SetProgressCallback(IPluginContext *pContext, const cell_t *params);
@@ -148,6 +149,7 @@ const sp_nativeinfo_t system2_natives[] =
     { "System2HTTPRequest.FollowRedirects.get", NativeHTTPRequest_GetFollowRedirects },
     { "System2HTTPRequest.FollowRedirects.set", NativeHTTPRequest_SetFollowRedirects },
     { "System2HTTPRequest.Headers.get", NativeHTTPRequest_GetHeaders },
+    { "System2HTTPRequest.SetProxy", NativeHTTPRequest_SetProxy },
 
     { "System2FTPRequest.System2FTPRequest", NativeFTPRequest_FTPRequest },
     { "System2FTPRequest.SetProgressCallback", NativeFTPRequest_SetProgressCallback },

natives/RequestNatives.cpp

@@ -312,6 +312,22 @@ cell_t NativeHTTPRequest_SetBasicAuthentication(IPluginContext *pContext, const
     return 1;
 }
 
+cell_t NativeHTTPRequest_SetProxy(IPluginContext *pContext, const cell_t *params) {
+    HTTPRequest *request = Request::ConvertRequest<HTTPRequest>(params[1], pContext);
+    if (request == NULL) {
+        return 0;
+    }
+
+    char *proxy;
+    char *userpswd;
+    pContext->LocalToString(params[2], &proxy);
+    pContext->LocalToString(params[3], &userpswd);
+
+    request->proxy = proxy;
+    request->proxyAuth = userpswd;
+    return 1;
+}
+
 cell_t NativeHTTPRequest_GET(IPluginContext *pContext, const cell_t *params) {
     HTTPRequest *request = Request::ConvertRequest<HTTPRequest>(params[1], pContext);
     if (request == NULL) {
@@ -415,7 +431,6 @@ cell_t NativeHTTPRequest_SetFollowRedirects(IPluginContext *pContext, const cell
     return 1;
 }
 
-
 cell_t NativeFTPRequest_FTPRequest(IPluginContext *pContext, const cell_t *params) {
     auto callback = system2Extension.CreateCallbackFunction(pContext->GetFunctionById(params[1]));
     if (!callback) {

sourcemod/scripting/include/system2.inc

@@ -380,6 +380,7 @@ public Extension __ext_system2 =
         MarkNativeAsOptional("System2HTTPRequest.GetHeaderName");
         MarkNativeAsOptional("System2HTTPRequest.SetUserAgent");
         MarkNativeAsOptional("System2HTTPRequest.SetBasicAuthentication");
+        MarkNativeAsOptional("System2HTTPRequest.SetProxy");
         MarkNativeAsOptional("System2HTTPRequest.GET");
         MarkNativeAsOptional("System2HTTPRequest.POST");
         MarkNativeAsOptional("System2HTTPRequest.PUT");

sourcemod/scripting/include/system2/request.inc

@@ -425,6 +425,16 @@ methodmap System2HTTPRequest < System2Request {
      */
     public native void SetBasicAuthentication(const char[] username, const char[] password);
 
+    /**
+     * Sets proxy (authentication) for the request.
+     *
+     * @param proxy     proxy to use for HTTP request.
+     * @param userpwd   authentication for proxy.
+     *
+     * @noreturn
+     * @error           Invalid request.
+     */
+    public native void SetProxy(const char[] proxy, const char[] userpwd);
 
     /**
      * Sends the request with the HTTP GET method.

threads/HTTPRequestThread.cpp

@@ -68,6 +68,17 @@ void HTTPRequestThread::RunThread(IThreadHandle *pHandle) {
             curl_easy_setopt(curl, CURLOPT_PASSWORD, this->httpRequest->password.c_str());
         }
 
+        // Set the proxy
+        if (!this->httpRequest->proxy.empty()) {
+            curl_easy_setopt(curl, CURLOPT_PROXY, this->httpRequest->proxy.c_str());
+            //curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
+        }
+
+        // Set the user and password of proxy
+        if (!this->httpRequest->proxyAuth.empty()) {
+            curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, this->httpRequest->proxyAuth.c_str());
+        }
+
         // Set the follow redirect property
         if (this->httpRequest->followRedirects) {
             curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);