Skip to content

auth.getMobileSession should use HTTPS #14

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
maxkueng wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −8
Open

auth.getMobileSession should use HTTPS #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9540101
Added HTTPS support and 'secure method' detection.
maxkueng Jan 19, 2013
5f0b3e9
Fixed typo
maxkueng Jan 19, 2013
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
24 changes: 16 additions & 8 deletions lib/lastfm/lastfm-request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
if (global.GENTLY_HIJACK) require = GENTLY_HIJACK.hijack(require);

var http = require("http")
, https = require('https')
, querystring = require('querystring')
, _ = require("underscore")
, crypto = require("crypto")
, LastFmBase = require("./lastfm-base");

var WRITE_METHODS = ["album.addtags", "album.removetag", "album.share",
var WRITE_METHODS = [ "auth.getmobilesession",
"album.addtags", "album.removetag", "album.share",
"artist.addtags", "artist.removetag", "artist.share", "artist.shout",
"event.attend", "event.share", "event.shout",
"library.addalbum", "library.addartist", "library.addtrack",
Expand All @@ -17,7 +19,8 @@ var WRITE_METHODS = ["album.addtags", "album.removetag", "album.share",
"track.updatenowplaying",
"user.shout"],
SIGNED_METHODS = ["auth.getmobilesession", "auth.getsession", "auth.gettoken",
"radio.getplaylist"];
"radio.getplaylist"],
SECURE_METHODS = ["auth.getmobilesession"];

var LastFmRequest = module.exports = function(lastfm, method, params) {
var that = this;
Expand All @@ -29,20 +32,21 @@ var LastFmRequest = module.exports = function(lastfm, method, params) {
sendRequest(lastfm.host, lastfm.url, params);

function sendRequest(host, url, params) {
var httpVerb = isWriteRequest() ? "POST" : "GET"
var requestParams = buildRequestParams(params);
var httpVerb = isWriteRequest(requestParams.method) ? "POST" : "GET"
var data = querystring.stringify(requestParams);
if (httpVerb == "GET") {
url += "?" + data;
}
var options = {
host: host,
port: 80,
port: isSecureMethod(requestParams.method) ? 443 : 80,
path: url,
method: httpVerb,
headers: requestHeaders(httpVerb, host, data)
};
var req = http.request(options, chunkedResponse);
var protocol = isSecureMethod(requestParams.method) ? https : http;
var req = protocol.request(options, chunkedResponse);
req.on("error", function(error) {
that.emit("error", error);
});
Expand All @@ -67,17 +71,17 @@ var LastFmRequest = module.exports = function(lastfm, method, params) {
requestParams.album = requestParams.album || params.track.album["#text"];
}
}
if (requiresSignature()) {
if (requiresSignature(method)) {
requestParams.api_sig = createSignature(requestParams, lastfm.secret);
}
return requestParams;
}

function requiresSignature() {
function requiresSignature(method) {
return params.signed || isWriteRequest() || isSignedMethod(method);
Copy link
Contributor Author

@maxkueng maxkueng Jan 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

method was undefined

}

function isWriteRequest() {
function isWriteRequest(method) {
return params.write || isWriteMethod(method);
Copy link
Contributor Author

@maxkueng maxkueng Jan 19, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

method was undefined again

}

Expand All @@ -89,6 +93,10 @@ var LastFmRequest = module.exports = function(lastfm, method, params) {
return method && _(WRITE_METHODS).include(method.toLowerCase());
}

function isSecureMethod(method) {
return method && _(SECURE_METHODS).include(method.toLowerCase());
}

function requestHeaders(httpVerb, host, data) {
var headers = {
"User-Agent": lastfm.useragent
Expand Down