taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add callback url to jira importer

remotes/origin/live-notifications
Jesús Espino 2017-03-23 18:04:16 +01:00
parent 500fe01b6e
commit cfbe29e9a0
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
taiga/front/urls.py
View File

@ -55,4 +55,6 @@ urls = {
"project-transfer": "/project/{0}/transfer/{1}", # project.slug, project.transfer_token "project-transfer": "/project/{0}/transfer/{1}", # project.slug, project.transfer_token
"project-admin": "/login?next=/project/{0}/admin/project-profile/details", # project.slug "project-admin": "/login?next=/project/{0}/admin/project-profile/details", # project.slug
"project-import-jira": "/project/new/import/jira?url={}",
} }

4
taiga/importers/jira/api.py
View File

@ -214,6 +214,7 @@ class JiraImporterViewSet(viewsets.ViewSet):
try: try:
oauth_data = request.user.auth_data.get(key="jira-oauth") oauth_data = request.user.auth_data.get(key="jira-oauth")
oauth_verifier = request.DATA.get("oauth_verifier", None)
oauth_token = oauth_data.extra['oauth_token'] oauth_token = oauth_data.extra['oauth_token']
oauth_secret = oauth_data.extra['oauth_secret'] oauth_secret = oauth_data.extra['oauth_secret']
server_url = oauth_data.extra['url'] server_url = oauth_data.extra['url']
@ -225,7 +226,8 @@ class JiraImporterViewSet(viewsets.ViewSet):
settings.IMPORTERS.get('jira', {}).get('cert', None), settings.IMPORTERS.get('jira', {}).get('cert', None),
oauth_token, oauth_token,
oauth_secret, oauth_secret,
True oauth_verifier,
False
) )
except Exception as e: except Exception as e:
raise exc.WrongArguments(_("Invalid or expired auth token")) raise exc.WrongArguments(_("Invalid or expired auth token"))

15
taiga/importers/jira/common.py
View File

@ -17,12 +17,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import requests import requests
from urllib.parse import parse_qsl from urllib.parse import parse_qsl, quote_plus
from oauthlib.oauth1 import SIGNATURE_RSA from oauthlib.oauth1 import SIGNATURE_RSA
from requests_oauthlib import OAuth1 from requests_oauthlib import OAuth1
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.conf import settings
from taiga.users.models import User from taiga.users.models import User
from taiga.projects.models import Points from taiga.projects.models import Points
@ -46,6 +47,7 @@ from taiga.projects.history.models import HistoryEntry
from taiga.projects.history.choices import HistoryType from taiga.projects.history.choices import HistoryType
from taiga.mdrender.service import render as mdrender from taiga.mdrender.service import render as mdrender
from taiga.importers import exceptions from taiga.importers import exceptions
from taiga.front.templatetags.functions import resolve as resolve_front_url
EPIC_COLORS = { EPIC_COLORS = {
"ghx-label-0": "#ffffff", "ghx-label-0": "#ffffff",
@ -735,7 +737,9 @@ class JiraImporterCommon:
if verify is None: if verify is None:
verify = server.startswith('https') verify = server.startswith('https')
oauth = OAuth1(consumer_key, signature_method=SIGNATURE_RSA, rsa_key=key_cert_data) callback_uri = resolve_front_url("project-import-jira", quote_plus(server))
oauth = OAuth1(consumer_key, signature_method=SIGNATURE_RSA, rsa_key=key_cert_data, callback_uri=callback_uri)
r = requests.post( r = requests.post(
server + '/plugins/servlet/oauth/request-token', verify=verify, auth=oauth) server + '/plugins/servlet/oauth/request-token', verify=verify, auth=oauth)
if r.status_code != 200: if r.status_code != 200:
@ -751,13 +755,16 @@ class JiraImporterCommon:
) )
@classmethod @classmethod
def get_access_token(cls, server, consumer_key, key_cert_data, request_token, request_token_secret, verify=False): def get_access_token(cls, server, consumer_key, key_cert_data, request_token, request_token_secret, request_verifier, verify=False):
callback_uri = resolve_front_url("project-import-jira", quote_plus(server))
oauth = OAuth1( oauth = OAuth1(
consumer_key, consumer_key,
signature_method=SIGNATURE_RSA, signature_method=SIGNATURE_RSA,
callback_uri=callback_uri,
rsa_key=key_cert_data, rsa_key=key_cert_data,
resource_owner_key=request_token, resource_owner_key=request_token,
resource_owner_secret=request_token_secret resource_owner_secret=request_token_secret,
verifier=request_verifier,
) )
r = requests.post(server + '/plugins/servlet/oauth/access-token', verify=verify, auth=oauth) r = requests.post(server + '/plugins/servlet/oauth/access-token', verify=verify, auth=oauth)
access = dict(parse_qsl(r.text)) access = dict(parse_qsl(r.text))