-
Notifications
You must be signed in to change notification settings - Fork 83
Fix vulnerabilities by removing request dependency #98
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.
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
55e2461
Fix vulnerabilities by removing request dependency
2466852
add node v9
288f3cf
add back node target
b937393
explicit node 10
4cf9d7c
update docs
d10b62b
update copyright
f8002bd
Merge branch 'master' into tyler/no-request-pr
a623768
Merge branch 'master' into tyler/no-request-pr
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,8 @@ node_js: | |
- '4' | ||
- '6' | ||
- '8' | ||
- node | ||
- '9' | ||
- '10' | ||
branches: | ||
only: | ||
- master | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/** | ||
* Copyright 2016-2017, Optimizely | ||
* Copyright 2016-2018, Optimizely | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
|
@@ -13,9 +13,9 @@ | |
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
var request = require('request'); | ||
|
||
var POST_HEADERS = {'content-type': 'application/json'}; | ||
var http = require('http'); | ||
var https = require('https'); | ||
var url = require('url'); | ||
|
||
module.exports = { | ||
/** | ||
|
@@ -25,23 +25,42 @@ module.exports = { | |
* @param {Object} eventObj.params parameters to pass to the request | ||
* @param {string} eventObj.httpVerb the HTTP request method type | ||
* @param {function} callback callback to execute | ||
* @return {Promise<Object>} the payload from the request | ||
* @return {ClientRequest} ClientRequest object which made the request | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we also document that we return undefined if the req is non POSt? Or we can return an explicit null in that case as well There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, I'll update this |
||
*/ | ||
dispatchEvent: function(eventObj, callback) { | ||
// Non-POST requests not supported | ||
if (eventObj.httpVerb !== 'POST') { | ||
callback(new Error('httpVerb not supported: ' + eventObj.httpVerb)); | ||
return; | ||
} | ||
|
||
var parsedUrl = url.parse(eventObj.url); | ||
var path = parsedUrl.path; | ||
if (parsedUrl.query) { | ||
path += '?' + parsedUrl.query; | ||
} | ||
|
||
var dataString = JSON.stringify(eventObj.params); | ||
|
||
var requestOptions = { | ||
uri: eventObj.url, | ||
body: eventObj.params, | ||
headers: POST_HEADERS, | ||
method: eventObj.httpVerb, | ||
json: true, | ||
host: parsedUrl.host, | ||
path: parsedUrl.path, | ||
method: 'POST', | ||
headers: { | ||
'content-type': 'application/json', | ||
'content-length': dataString.length.toString(), | ||
} | ||
}; | ||
|
||
var requestCallback = function(error, response, body) { | ||
if (response && response.statusCode && response.statusCode >= 200 && response.statusCode < 400 && callback && typeof callback == 'function') { | ||
callback(); | ||
} | ||
} | ||
}; | ||
|
||
return request(requestOptions, requestCallback); | ||
var req = (parsedUrl.protocol === 'http:' ? http : https).request(requestOptions, requestCallback); | ||
req.write(dataString); | ||
req.end(); | ||
return req; | ||
} | ||
}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
scope: production |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like Node 10 might be causing issues?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I was talking about it with @aliabbasrizvi on Friday. It's affecting master as well (https://travis-ci.org/optimizely/javascript-sdk/builds/380812924), hence the other PR #101