Skip to content

Commit

Permalink
Merge pull request #2137 from pwielgolaski/#2129
Browse files Browse the repository at this point in the history
when strictSsl is false set GIT_SSL_NO_VERIFY=true for git command
  • Loading branch information
sheerun committed Jan 24, 2016
2 parents 9d2681b + f0a54d0 commit d63047b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/core/resolvers/GitResolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function GitResolver(decEndpoint, config, logger) {
// anyway
mkdirp.sync(config.storage.empty);
process.env.GIT_TEMPLATE_DIR = config.storage.empty;
process.env.GIT_SSL_NO_VERIFY = (!config.strictSsl).toString();

Resolver.call(this, decEndpoint, config, logger);

Expand Down
20 changes: 20 additions & 0 deletions test/core/resolvers/gitResolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ var defaultConfig = require('../../../lib/config');
describe('GitResolver', function () {
var tempDir = path.resolve(__dirname, '../../tmp/tmp');
var originalrefs = GitResolver.refs;
var originalEnv = process.env;
var logger;

before(function () {
Expand All @@ -23,6 +24,7 @@ describe('GitResolver', function () {

afterEach(function () {
logger.removeAllListeners();
process.env = originalEnv;
});

function clearResolverRuntimeCache() {
Expand All @@ -41,6 +43,24 @@ describe('GitResolver', function () {
describe('misc', function () {
it.skip('should error out if git is not installed');
it.skip('should setup git template dir to an empty folder');
it('should set process.env.GIT_SSL_NO_VERIFY when strictSSL is false', function () {
var resolver;
var decEndpoint = { source: 'foo'};

expect(process.env).to.not.have.property('GIT_SSL_NO_VERIFY');

resolver = new GitResolver(decEndpoint, defaultConfig(), logger);
expect(process.env).to.have.property('GIT_SSL_NO_VERIFY','false');
delete process.env.GIT_SSL_NO_VERIFY;

resolver = new GitResolver(decEndpoint, defaultConfig({strictSsl: false}), logger);
expect(process.env).to.have.property('GIT_SSL_NO_VERIFY','true');
delete process.env.GIT_SSL_NO_VERIFY;

resolver = new GitResolver(decEndpoint, defaultConfig({strictSsl: true}), logger);
expect(process.env).to.have.property('GIT_SSL_NO_VERIFY','false');
delete process.env.GIT_SSL_NO_VERIFY;
});
});

describe('.hasNew', function () {
Expand Down

0 comments on commit d63047b

Please sign in to comment.