Skip to content
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

Jump to bottom

Switch from SIGNATURE_RSA to SIGNATURE_HMAC_SHA1 #1643

Merged
merged 2 commits into from May 15, 2023
Merged

Switch from SIGNATURE_RSA to SIGNATURE_HMAC_SHA1 #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e16fff
Switch from SIGNATURE_RSA to SIGNATURE_RSA_HMAC_SHA1
traylenator Apr 13, 2023
163a121
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions jira/client.py
View file
Open in desktop
Expand Up @@ -3702,13 +3702,13 @@ def _create_http_basic_session(
def _create_oauth_session(
self, oauth, timeout: float | int | tuple[float, float] | None
):
from oauthlib.oauth1 import SIGNATURE_RSA
from oauthlib.oauth1 import SIGNATURE_HMAC_SHA1
from requests_oauthlib import OAuth1

oauth_instance = OAuth1(
oauth["consumer_key"],
rsa_key=oauth["key_cert"],
signature_method=SIGNATURE_RSA,
signature_method=SIGNATURE_HMAC_SHA1,
resource_owner_key=oauth["access_token"],
resource_owner_secret=oauth["access_token_secret"],
)
Expand Down
8 changes: 5 additions & 3 deletions jira/jirashell.py
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@

import keyring
import requests
from oauthlib.oauth1 import SIGNATURE_RSA
from oauthlib.oauth1 import SIGNATURE_HMAC_SHA1
from requests_oauthlib import OAuth1

from jira import JIRA, __version__
Expand All @@ -29,7 +29,9 @@ def oauth_dance(server, consumer_key, key_cert_data, print_tokens=False, verify=
verify = server.startswith("https")

# step 1: get request tokens
oauth = OAuth1(consumer_key, signature_method=SIGNATURE_RSA, rsa_key=key_cert_data)
oauth = OAuth1(
consumer_key, signature_method=SIGNATURE_HMAC_SHA1, rsa_key=key_cert_data
)
r = requests.post(
server + "/plugins/servlet/oauth/request-token", verify=verify, auth=oauth
)
Expand Down Expand Up @@ -71,7 +73,7 @@ def oauth_dance(server, consumer_key, key_cert_data, print_tokens=False, verify=
# step 3: get access tokens for validated user
oauth = OAuth1(
consumer_key,
signature_method=SIGNATURE_RSA,
signature_method=SIGNATURE_HMAC_SHA1,
rsa_key=key_cert_data,
resource_owner_key=request_token,
resource_owner_secret=request_token_secret,
Expand Down