From 899ddec4ff9b0afecaf0bafe040c81bc71dd8ff5 Mon Sep 17 00:00:00 2001 From: arraykeys Date: Mon, 29 Nov 2021 11:28:54 +0800 Subject: [PATCH] update --- README.md | 21 +++++++++++---------- README_ZH.md | 5 +++++ docs/manual/manual.md | 21 +++++++++++---------- docs/manual/zh/manual.md | 5 +++++ 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index a9dca3e..ce74df2 100644 --- a/README.md +++ b/README.md @@ -1885,7 +1885,6 @@ Local execution: Then the local UDP port 53 provides a secure anti-pollution DNS resolution function. #### 8.2.8 Custom encrypted SOCKS5 upstream agent -  Suppose there is a upstream agent: 2.2.2.2:33080 The commands executed by the upstream agent are: `proxy socks -t kcp -p :33080 -z password` @@ -1989,15 +1988,17 @@ Explanation: `http://`,`socks5://` is fixed, `127.0.0.1:3100` is the address of 2. When `sps` is 1. Upstream supports socks5, http(s) proxy, support authentication, format: `protocol://a:b@2.2.2.2:33080?argk=argv`, please refer to SPS chapter for details, **multiple upstreams** , the description of the `-P` parameter. 3. Parameters, `?` followed by `argk=argv` are parameters: parameter name = parameter value, multiple parameters are connected with `&`. -All the supported parameters are as follows, and the meaning of the command line with the same name is the same. -1. parent-type : upper-level transport type, support tcp, tls, ws, wss -2. parent-ws-method: The encryption method of the upper-level ws transmission type, the supported value is the same as the value range supported by the command line. -3. parent-ws-password: The upper-level ws transmission type encryption password, the alphanumeric password -4. parent-tls-single : Whether the upper-level tls transport type is a one-way tls, which can be: true | false -5. timeout : timeout for establishing tcp connection, number, in milliseconds -6. ca : The base64-encoded string of the upper-level tls transport type ca certificate file. -7. cert : The base64 encoded string of the higher level tls transport type certificate file. -8. key : The base64 encoded string of the higher-level tls transport type certificate key file. +All the supported parameters are as follows, and the meaning of the command line with the same name is the same. + + 1. parent-type : upper-level transport type, support tcp, tls, ws, wss + 2. parent-ws-method: The encryption method of the upper-level ws transmission type, the supported value is the same as the value range supported by the command line. + 3. parent-ws-password: The upper-level ws transmission type encryption password, the alphanumeric password + 4. parent-tls-single : Whether the upper-level tls transport type is a one-way tls, which can be: true | false + 5. timeout : timeout for establishing tcp connection, number, in milliseconds + 6. ca : The base64-encoded string of the upper-level tls transport type ca certificate file. + 7. cert : The base64 encoded string of the higher level tls transport type certificate file. + 8. key : The base64 encoded string of the higher-level tls transport type certificate key file. + 9. luminati:if upstram is luminati proxies，value can be: true or false。 ### Traffic report / Traffic limit / Traffic statistics diff --git a/README_ZH.md b/README_ZH.md index 88ff41b..03f185c 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -2159,6 +2159,7 @@ upstream支持socks5、http(s)代理，支持认证，格式：`protocol://a:b@2 6. ca : 上级底层tls传输类型的ca证书文件经过base64编码后的字符串。 7. cert : 上级底层tls传输类型的证书文件经过base64编码后的字符串。 8. key : 上级底层tls传输类型的证书密钥文件经过base64编码后的字符串。 +9. luminati:上级是否是luminati代理，可以是：true | false。 ### 流量上报/流量统计/流量限制 @@ -2434,6 +2435,10 @@ Luminati提供了高质量稳定的住宅IP可以做很多事情，但是价格 提醒，此种做法，有可能带来Luminati限制你的账号风险，VPS的IP也有可能被可能Luminati屏蔽导致转换不能工作，风险自负。 +另外上面只能把luminati的http代理转成自定义认证的二级http代理，那么如如果要把luminati的http代理转成http(s)+socks5代理可以使用参数`--luminati`。 + +上面步骤 `1.` 执行的命令改为：`proxy sps -p :7777 --luminati --disable-ss -a user1:pass1 -a user2:pass2 -P http://username:password@xxx.com:8888` + ## 17.典型用法-认证转为无认证 通过proxy可以把有认证功能的代理转成没有认证的代理。 diff --git a/docs/manual/manual.md b/docs/manual/manual.md index ffd4ce2..442c98f 100644 --- a/docs/manual/manual.md +++ b/docs/manual/manual.md @@ -1679,7 +1679,6 @@ Local execution: Then the local UDP port 53 provides a secure anti-pollution DNS resolution function. #### 8.2.8 Custom encrypted SOCKS5 upstream agent -  Suppose there is a upstream agent: 2.2.2.2:33080 The commands executed by the upstream agent are: `proxy socks -t kcp -p :33080 -z password` @@ -1783,15 +1782,17 @@ Explanation: `http://`,`socks5://` is fixed, `127.0.0.1:3100` is the address of 2. When `sps` is 1. Upstream supports socks5, http(s) proxy, support authentication, format: `protocol://a:b@2.2.2.2:33080?argk=argv`, please refer to SPS chapter for details, **multiple upstreams** , the description of the `-P` parameter. 3. Parameters, `?` followed by `argk=argv` are parameters: parameter name = parameter value, multiple parameters are connected with `&`. -All the supported parameters are as follows, and the meaning of the command line with the same name is the same. -1. parent-type : upper-level transport type, support tcp, tls, ws, wss -2. parent-ws-method: The encryption method of the upper-level ws transmission type, the supported value is the same as the value range supported by the command line. -3. parent-ws-password: The upper-level ws transmission type encryption password, the alphanumeric password -4. parent-tls-single : Whether the upper-level tls transport type is a one-way tls, which can be: true | false -5. timeout : timeout for establishing tcp connection, number, in milliseconds -6. ca : The base64-encoded string of the upper-level tls transport type ca certificate file. -7. cert : The base64 encoded string of the higher level tls transport type certificate file. -8. key : The base64 encoded string of the higher-level tls transport type certificate key file. +All the supported parameters are as follows, and the meaning of the command line with the same name is the same. + + 1. parent-type : upper-level transport type, support tcp, tls, ws, wss + 2. parent-ws-method: The encryption method of the upper-level ws transmission type, the supported value is the same as the value range supported by the command line. + 3. parent-ws-password: The upper-level ws transmission type encryption password, the alphanumeric password + 4. parent-tls-single : Whether the upper-level tls transport type is a one-way tls, which can be: true | false + 5. timeout : timeout for establishing tcp connection, number, in milliseconds + 6. ca : The base64-encoded string of the upper-level tls transport type ca certificate file. + 7. cert : The base64 encoded string of the higher level tls transport type certificate file. + 8. key : The base64 encoded string of the higher-level tls transport type certificate key file. + 9. luminati:if upstram is luminati proxies，value can be: true or false。 ### Traffic report / Traffic limit / Traffic statistics diff --git a/docs/manual/zh/manual.md b/docs/manual/zh/manual.md index a207426..a5d3392 100644 --- a/docs/manual/zh/manual.md +++ b/docs/manual/zh/manual.md @@ -1938,6 +1938,7 @@ upstream支持socks5、http(s)代理，支持认证，格式：`protocol://a:b@2 6. ca : 上级底层tls传输类型的ca证书文件经过base64编码后的字符串。 7. cert : 上级底层tls传输类型的证书文件经过base64编码后的字符串。 8. key : 上级底层tls传输类型的证书密钥文件经过base64编码后的字符串。 +9. luminati:上级是否是luminati代理，可以是：true | false。 ### 流量上报/流量统计/流量限制 @@ -2213,6 +2214,10 @@ Luminati提供了高质量稳定的住宅IP可以做很多事情，但是价格 提醒，此种做法，有可能带来Luminati限制你的账号风险，VPS的IP也有可能被可能Luminati屏蔽导致转换不能工作，风险自负。 +另外上面只能把luminati的http代理转成自定义认证的二级http代理，那么如如果要把luminati的http代理转成http(s)+socks5代理可以使用参数`--luminati`。 + +上面步骤 `1.` 执行的命令改为：`proxy sps -p :7777 --luminati --disable-ss -a user1:pass1 -a user2:pass2 -P http://username:password@xxx.com:8888` + ## 17.典型用法-认证转为无认证 通过proxy可以把有认证功能的代理转成没有认证的代理。