Skip to content

Commit

Permalink
Fixes for issues #20, #22
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrconlin
jrconlin committed Sep 29, 2014
1 parent 73e9a0a commit a56e61c
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 16 deletions.
11 changes: 7 additions & 4 deletions js/OAuthSimple.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ if (OAuthSimple === undefined)
this._secrets.oauth_token = this._secrets.access_token;
}
if (this._secrets['access_secret']) {
this._secrets.oauth_secret = this._secrets.access_secret;
this._secrets.shared_secret = this._secrets.access_secret;
}
if (this._secrets['oauth_token_secret']) {
this._secrets.oauth_secret = this._secrets.oauth_token_secret;
Expand Down Expand Up @@ -271,7 +271,7 @@ if (OAuthSimple === undefined)
return {
parameters: this._parameters,
signature: this._oauthEscape(this._parameters['oauth_signature']),
signed_url: this._path + '?' + this._normalizedParameters(),
signed_url: this._path + '?' + normParams,
header: this.getHeaderString()
};
};
Expand Down Expand Up @@ -450,17 +450,20 @@ if (OAuthSimple === undefined)
return elements.join('&');
};

self._generateSignature = function() {
self._generateSignature = function(normParams="") {

var secretKey = this._oauthEscape(this._secrets.shared_secret) + '&' +
this._oauthEscape(this._secrets.oauth_secret);
if (this._parameters['oauth_signature_method'] == 'PLAINTEXT')
{
return secretKey;
}
if (normParams == "") {
normParams = this._normalizedParameters();
}
if (this._parameters['oauth_signature_method'] == 'HMAC-SHA1')
{
var sigString = this._oauthEscape(this._action) + '&' + this._oauthEscape(this._path) + '&' + this._oauthEscape(this._normalizedParameters());
var sigString = this._oauthEscape(this._action) + '&' + this._oauthEscape(this._path) + '&' + this.normParams);
return this.b64_hmac_sha1(secretKey, sigString);
}
return null;
Expand Down
8 changes: 6 additions & 2 deletions perl/OAuthSimple.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ hash of arguments for the call. Allowed elements are:
return {
'parameters' => $this->{_parameters},
'signature' => $this->_oauthEscape($this->{_parameters}->{oauth_signature}),
'signed_url' => $this->{_path} . '?' . $this->_normalizedParameters(),
'signed_url' => $this->{_path} . '?' . $normParams,
'header' => $this->getHeaderString(),
'sbs'=> $this->{sbs}
};
Expand Down Expand Up @@ -607,6 +607,7 @@ see .sign()

sub _generateSignature {
my $this=shift;
my $normalizedParameters = shift;
my $secretKey = '';

if(defined($this->{_secrets}->{shared_secret})) {
Expand All @@ -616,10 +617,13 @@ see .sign()
if(defined($this->{_secrets}->{oauth_secret})) {
$secretKey .= $this->_oauthEscape($this->{_secrets}->{oauth_secret});
}
if (empty($normalizedParameters)) {
$normalizedParameters = $this->_normalizedParameters();
}
if ($this->{_parameters}->{oauth_signature_method} eq 'PLAINTEXT') {
return $secretKey;
} elsif ($this->{_parameters}->{oauth_signature_method} eq 'HMAC-SHA1') {
$this->{sbs} = $this->_oauthEscape($this->{_action}).'&'.$this->_oauthEscape($this->{_path}).'&'.$this->_oauthEscape($this->_normalizedParameters());
$this->{sbs} = $this->_oauthEscape($this->{_action}).'&'.$this->_oauthEscape($this->{_path}).'&'.$normalizedParameters;
# For what it's worth, I prefer long form method calls like this since it identifies the source package.
return MIME::Base64::encode_base64(Digest::SHA::hmac_sha1($this->{sbs},$secretKey));
} else {
Expand Down
19 changes: 11 additions & 8 deletions php/OAuthSimple.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ public function signatures ($signatures)
}
if (isset($this->_secrets['access_secret']))
{
$this->_secrets['oauth_secret'] = $this->_secrets['access_secret'];
$this->_secrets['shared_secret'] = $this->_secrets['access_secret'];
}
if (isset($this->_secrets['access_token_secret']))
if (isset($this->_secrets['oauth_token_secret']))
{
$this->_secrets['oauth_secret'] = $this->_secrets['access_token_secret'];
$this->_secrets['oauth_secret'] = $this->_secrets['oauth_token_secret'];
}
if (empty($this->_secrets['consumer_key']))
{
Expand Down Expand Up @@ -289,7 +289,7 @@ public function sign($args=array())
return Array (
'parameters' => $this->_parameters,
'signature' => self::_oauthEscape($this->_parameters['oauth_signature']),
'signed_url' => $this->_path . '?' . $this->_normalizedParameters(),
'signed_url' => $this->_path . '?' . $normParams,
'header' => $this->getHeaderString(),
'sbs'=> $this->sbs
);
Expand Down Expand Up @@ -374,7 +374,7 @@ private static function _oauthEscape($string)
}
$string = rawurlencode($string);

//FIX: rawurlencode of ~
//FIX: rawurlencode of ~
$string = str_replace('%7E','~', $string);
$string = str_replace('+','%20',$string);
$string = str_replace('!','%21',$string);
Expand Down Expand Up @@ -477,7 +477,7 @@ private function _normalizedParameters()
}


private function _generateSignature ()
private function _generateSignature ($parameters="")
{
$secretKey = '';
if(isset($this->_secrets['shared_secret']))
Expand All @@ -489,13 +489,16 @@ private function _generateSignature ()
if(isset($this->_secrets['oauth_secret']))
{
$secretKey .= self::_oauthEscape($this->_secrets['oauth_secret']);
}
}
if(empty($parameters)){
$parameters = $this->_normalizedParameters();
}
switch($this->_parameters['oauth_signature_method'])
{
case 'PLAINTEXT':
return urlencode($secretKey);;
case 'HMAC-SHA1':
$this->sbs = self::_oauthEscape($this->_action).'&'.self::_oauthEscape($this->_path).'&'.self::_oauthEscape($this->_normalizedParameters());
$this->sbs = self::_oauthEscape($this->_action).'&'.self::_oauthEscape($this->_path).'&'.$parameters;

return base64_encode(hash_hmac('sha1',$this->sbs,$secretKey,TRUE));
default:
Expand Down
4 changes: 2 additions & 2 deletions python/OAuthSimple/OAuthSimple.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def sign(self, args={}):
'signature': self._oauthEscape(
self._parameters['oauth_signature']),
'signed_url': '%s?%s' % (self._path,
self._normalizeParameters()),
normParamString),
'header': self.getHeaderString(),
'sbs': self.sbs}

Expand Down Expand Up @@ -236,7 +236,7 @@ def _generateSignature(self, normParamString):
elif (self._parameters['oauth_signature_method'] == 'HMAC-SHA1'):
self.sbs = '&'.join([self._oauthEscape(self._action),
self._oauthEscape(self._path),
self._oauthEscape(normParamString)])
normParamString])
return base64.b64encode(hmac.new(secretKey,
self.sbs,
hashlib.sha1).digest())

0 comments on commit a56e61c

Please sign in to comment.