Browse Source

proxy basic authentication implementation

pull/1387/head
Pavel Samokha 7 years ago
parent
commit
0795f81fcf
  1. 18
      app/view/preferences/Preferences.js
  2. 11
      electron/main.js

18
app/view/preferences/Preferences.js

@ -260,12 +260,11 @@ Ext.define('Rambox.view.preferences.Preferences',{
,checkboxName: 'proxy' ,checkboxName: 'proxy'
,margin: '10 0 0 0' ,margin: '10 0 0 0'
,padding: 10 ,padding: 10
,layout: 'hbox' ,layout: 'vbox'
,defaults: { labelAlign: 'top' } ,defaults: { labelAlign: 'left' }
,items: [ ,items: [
{ {
xtype: 'textfield' xtype: 'textfield'
,vtype: 'url'
,fieldLabel: 'Host' ,fieldLabel: 'Host'
,name: 'proxyHost' ,name: 'proxyHost'
,value: config.proxyHost ,value: config.proxyHost
@ -275,9 +274,20 @@ Ext.define('Rambox.view.preferences.Preferences',{
xtype: 'numberfield' xtype: 'numberfield'
,fieldLabel: 'Port' ,fieldLabel: 'Port'
,name: 'proxyPort' ,name: 'proxyPort'
,width: 100
,value: config.proxyPort ,value: config.proxyPort
,margin: '0 0 0 10' ,margin: '0 0 0 10'
},{
xtype: 'textfield'
,fieldLabel: 'Login'
,name: 'proxyLogin'
,value: config.proxyLogin
,margin: '0 0 0 10'
},{
xtype: 'textfield'
,fieldLabel: 'Password'
,name: 'proxyPassword'
,value: config.proxyPassword
,margin: '0 0 0 10'
} }
] ]
} }

11
electron/main.js

@ -32,6 +32,8 @@ const config = new Config({
,proxy: false ,proxy: false
,proxyHost: '' ,proxyHost: ''
,proxyPort: '' ,proxyPort: ''
,proxyLogin: ''
,proxyPassword: ''
,locale: 'en' ,locale: 'en'
,enable_hidpi_support: false ,enable_hidpi_support: false
,default_service: 'ramboxTab' ,default_service: 'ramboxTab'
@ -461,7 +463,14 @@ ipcMain.on('toggleWin', function(event, allwaysShow) {
}); });
// Proxy // Proxy
if ( config.get('proxy') ) app.commandLine.appendSwitch('proxy-server', config.get('proxyHost')+':'+config.get('proxyPort')); if ( config.get('proxy') ) {
app.commandLine.appendSwitch('proxy-server', 'http://'+config.get('proxyHost')+':'+config.get('proxyPort'));
app.on('login', (event, webContents, request, authInfo, callback) => {
event.preventDefault()
callback(config.get('proxyLogin'), config.get('proxyPassword'))
})
}
// Disable GPU Acceleration for Linux // Disable GPU Acceleration for Linux
// to prevent White Page bug // to prevent White Page bug

Loading…
Cancel
Save