Skip to content

Add support for HTTP(S) proxy #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for HTTP(S) proxy #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ var s3 = require('s3');
var url = require('url');
var http = require('http');
var https = require('https');
var ProxyAgent = require('https-proxy-agent');
var argOptions = {
'default': {
'config': path.join(osenv.home(), '.s3cfg'),
Expand Down Expand Up @@ -69,25 +70,36 @@ fs.readFile(args.config, {encoding: 'utf8'}, function(err, contents) {
if (config && config.default) {
accessKeyId = config.default.access_key;
secretAccessKey = config.default.secret_key;
proxyHost = config.default.proxy_host;
proxyPort = config.default.proxy_port;
}
if (!secretAccessKey || !accessKeyId) {
console.error("Config file missing access_key or secret_key");
process.exit(1);
return;
}
setup(secretAccessKey, accessKeyId);
setup(secretAccessKey, accessKeyId, proxyHost, proxyPort);
});

function setup(secretAccessKey, accessKeyId) {
function setup(secretAccessKey, accessKeyId, proxyHost, proxyPort) {
var maxSockets = parseInt(args['max-sockets'], 10);
http.globalAgent.maxSockets = maxSockets;
https.globalAgent.maxSockets = maxSockets;
var agent;

if (proxyHost && proxyPort) {
agent = new ProxyAgent({ host: proxyHost, port: proxyPort });
agent.maxSockets = maxSockets;
}
client = s3.createClient({
s3Options: {
accessKeyId: accessKeyId,
secretAccessKey: secretAccessKey,
sslEnabled: !args.insecure,
region: args.region,
httpOptions: {
agent: agent
},
},
});
var cmd = args._.shift();
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
"author": "Andrew Kelley <superjoe30@gmail.com>",
"license": "MIT",
"dependencies": {
"https-proxy-agent": "^1.0.0",
"human-size": "~1.1.0",
"ini": "~1.2.1",
"minimist": "~1.1.0",
"osenv": "~0.1.0",
"s3": "~4.2.0",
"human-size": "~1.1.0"
"s3": "~4.2.0"
},
"devDependencies": {},
"scripts": {
Expand Down