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

1. cannot connect to SOCKS proxy with login/password auth #83

Browse Source 
2. Opening the settings of a Socks5 Proxy with saved credentials deletes those credentials #67
This commit is contained in:
proxy.zeroomega 2025-01-14 13:42:34 +08:00
parent 07c950c3f9
commit 785cb04196
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
omega-target-chromium-extension/src/module/proxy/proxy_impl_firefox.coffee
View File

@ -48,6 +48,7 @@ class FirefoxProxyImpl extends ProxyImpl
blobUrl = URL.createObjectURL(blob) blobUrl = URL.createObjectURL(blob)
browser.proxy.settings.set({ browser.proxy.settings.set({
value: { value: {
proxyDNS: true,
proxyType: 'autoConfig', proxyType: 'autoConfig',
autoConfigUrl: blobUrl autoConfigUrl: blobUrl
} }
@ -58,7 +59,7 @@ class FirefoxProxyImpl extends ProxyImpl
@_optionsReadyCallback = null @_optionsReadyCallback = null
return @setProxyAuth(profile, options) return @setProxyAuth(profile, options)
onRequest: (requestDetails) -> onRequest: (requestDetails) ->
return undefined if browser.extension.isAllowedIncognitoAccess() #return undefined if browser.extension.isAllowedIncognitoAccess()
# TODO 将来可以在这里实现按标签进行代理控制功能 # TODO 将来可以在这里实现按标签进行代理控制功能
#return undefined #return undefined
# The browser only recognizes native promises return values, not Bluebird. # The browser only recognizes native promises return values, not Bluebird.
@ -71,7 +72,7 @@ class FirefoxProxyImpl extends ProxyImpl
switch profile.profileType switch profile.profileType
when 'DirectProfile' when 'DirectProfile'
return {type: 'direct'} return {type: 'direct'}
when 'SystemProfile' when 'SystemProfile', 'PacProfile'
# Returning undefined means using the default proxy from previous. # Returning undefined means using the default proxy from previous.
# https://hg.mozilla.org/mozilla-central/rev/9f0ee2f582a2#l1.337 # https://hg.mozilla.org/mozilla-central/rev/9f0ee2f582a2#l1.337
return undefined return undefined

4
omega-web/src/omega/controllers/fixed_profile.coffee
View File

@ -38,7 +38,7 @@ angular.module('omega').controller 'FixedProfileCtrl', ($scope, $modal,
$scope.proxyEditors = {} $scope.proxyEditors = {}
socks5AuthSupported = (browser?.proxy?.register?) socks5AuthSupported = (browser?.proxy?.onRequest?)
$scope.authSupported = { $scope.authSupported = {
"http": true, "http": true,
"https": true, "https": true,
@ -71,8 +71,6 @@ angular.module('omega').controller 'FixedProfileCtrl', ($scope, $modal,
return unless proxyEditors return unless proxyEditors
for scheme in $scope.urlSchemes for scheme in $scope.urlSchemes
proxy = proxyEditors[scheme] proxy = proxyEditors[scheme]
if $scope.profile.auth and not $scope.authSupported[proxy.scheme]
delete $scope.profile.auth[proxyProperties[scheme]]
if not proxy.scheme if not proxy.scheme
if not scheme if not scheme
proxyEditors[scheme] = {} proxyEditors[scheme] = {}