tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-01-22 23:08:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix SOCKS5 servers.

Browse Source
This commit is contained in:
FelisCatus 2017-04-14 00:50:03 -04:00
parent 9467a58f6f
commit 4dca36a45f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
omega-target-chromium-extension/omega_webext_proxy_script.js
View File

@ -43,8 +43,10 @@ FindProxyForURL = (function () {
// https://bugzilla.mozilla.org/show_bug.cgi?id=1319641 // https://bugzilla.mozilla.org/show_bug.cgi?id=1319641
if (next.charCodeAt(0) !== 43) { if (next.charCodeAt(0) !== 43) {
// MOZ: HTTPS proxies are supported under the prefix PROXY. // MOZ: HTTPS proxies are supported under the prefix PROXY.
// MOZ: SOCKS5 proxies are supported under the prefix SOCKS.
// https://dxr.mozilla.org/mozilla-central/source/toolkit/components/extensions/ProxyScriptContext.jsm#180 // https://dxr.mozilla.org/mozilla-central/source/toolkit/components/extensions/ProxyScriptContext.jsm#180
return next.replace(/HTTPS /g, 'PROXY '); return next.replace(/HTTPS /g, 'PROXY ')
.replace(/SOCKS5 /g, 'SOCKS ');
} }
} else if (matchResult.profileName) { } else if (matchResult.profileName) {
next = OmegaPac.Profiles.nameAsKey(matchResult.profileName) next = OmegaPac.Profiles.nameAsKey(matchResult.profileName)

4
omega-target-chromium-extension/overlay/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "__MSG_manifest_app_name__", "name": "__MSG_manifest_app_name__",
"version": "2.4.7", "version": "2.4.8",
"description": "__MSG_manifest_app_description__", "description": "__MSG_manifest_app_description__",
"key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkhwZJT76btQ04EEMOFtZPLESD1TmSVjbLjs0OyesD9Ht8YllFPfJ3qmtbSQGVuvmxH1GK/jUO2QcEWb8bHuOjoRlq20fi5j5Aq90O8FKET+y5D8PxCyi3WmnquiEwaE5cNmaCsw/G2JlO+bZOtdQ/QKOvMxBAegABYimEGfSvCMVUEvpymys0gBhLoch72zPAiJUBkf0z8BtjYTueMRcRXkrSeRPLygUDQnZ1TkQWMYYBp/zqpD5ggxytAklEMQzR9Hn0lqu5s7iuUAgihbysPn/8Wh00Zj5FySpK//KcpG3JS7UWxC28oSt8z5ZR3YimnX+HX3P36V0mC1pgM4o7wIDAQAB", "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkhwZJT76btQ04EEMOFtZPLESD1TmSVjbLjs0OyesD9Ht8YllFPfJ3qmtbSQGVuvmxH1GK/jUO2QcEWb8bHuOjoRlq20fi5j5Aq90O8FKET+y5D8PxCyi3WmnquiEwaE5cNmaCsw/G2JlO+bZOtdQ/QKOvMxBAegABYimEGfSvCMVUEvpymys0gBhLoch72zPAiJUBkf0z8BtjYTueMRcRXkrSeRPLygUDQnZ1TkQWMYYBp/zqpD5ggxytAklEMQzR9Hn0lqu5s7iuUAgihbysPn/8Wh00Zj5FySpK//KcpG3JS7UWxC28oSt8z5ZR3YimnX+HX3P36V0mC1pgM4o7wIDAQAB",
"icons": { "icons": {
@ -54,7 +54,7 @@
}, },
"applications": { "applications": {
"gecko": { "gecko": {
"id": "switchyomega@example.com", "id": "switchyomega@feliscatus.addons.mozilla.org",
"strict_min_version": "55.0a1" "strict_min_version": "55.0a1"
} }
} }

2
omega-target-chromium-extension/src/options.coffee
View File

@ -216,7 +216,7 @@ class ChromeOptions extends OmegaTarget.Options
if message.level == 'error' if message.level == 'error'
@log.error(message) @log.error(message)
else if message.level == 'warn' else if message.level == 'warn'
@log.warn(message) @log.error(message)
else else
@log.log(message) @log.log(message)