Merge pull request #1942 from YunfanZhang42/devel

Added an awx-manage command for generating OAuth2 token.
This commit is contained in:
Yunfan Zhang
2018-05-31 16:13:58 -04:00
committed by GitHub
3 changed files with 88 additions and 26 deletions

View File

@@ -949,7 +949,6 @@ class UserSerializer(BaseSerializer):
tokens = self.reverse('api:o_auth2_token_list', kwargs={'pk': obj.pk}), tokens = self.reverse('api:o_auth2_token_list', kwargs={'pk': obj.pk}),
authorized_tokens = self.reverse('api:user_authorized_token_list', kwargs={'pk': obj.pk}), authorized_tokens = self.reverse('api:user_authorized_token_list', kwargs={'pk': obj.pk}),
personal_tokens = self.reverse('api:o_auth2_personal_token_list', kwargs={'pk': obj.pk}), personal_tokens = self.reverse('api:o_auth2_personal_token_list', kwargs={'pk': obj.pk}),
)) ))
return res return res
@@ -1170,9 +1169,10 @@ class OAuth2TokenSerializer(BaseSerializer):
).format(self.ALLOWED_SCOPES)) ).format(self.ALLOWED_SCOPES))
return value return value
def create(self, validated_data): def create(self, validated_data, from_command_line=False):
current_user = self.context['request'].user if not from_command_line:
validated_data['user'] = current_user current_user = self.context['request'].user
validated_data['user'] = current_user
validated_data['token'] = generate_token() validated_data['token'] = generate_token()
validated_data['expires'] = now() + timedelta( validated_data['expires'] = now() + timedelta(
seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS'] seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS']

View File

@@ -0,0 +1,26 @@
from awx.api.serializers import OAuth2TokenSerializer
from django.core.management.base import BaseCommand
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
class Command(BaseCommand):
"""Command that creates an OAuth2 token for a certain user. Returns the value of created token."""
help='Usage: awx-manage create_oauth2_token --user=username. Will return the value of created token.'
def add_arguments(self, parser):
parser.add_argument('--user', dest='user', type=str)
def handle(self, *args, **options):
if not options['user']:
self.stdout.write("Username not supplied. Usage: awx-manage create_oauth2_token --user=username.")
return
try:
user = User.objects.get(username=options['user'])
except ObjectDoesNotExist:
self.stdout.write("The user does not exist.")
return
config = {'user': user, 'scope':'write'}
serializer_obj = OAuth2TokenSerializer()
token_record = serializer_obj.create(config, True)
self.stdout.write(token_record.token)

View File

@@ -0,0 +1,36 @@
import pytest
import string
import random
import StringIO
from django.contrib.auth.models import User
from django.core.management import call_command
from awx.main.models.oauth import OAuth2AccessToken
@pytest.mark.django_db
@pytest.mark.inventory_import
class TestOAuth2CreateCommand:
def test_no_user_option(self):
out = StringIO.StringIO()
call_command('create_oauth2_token', stdout=out)
assert 'Username not supplied.' in out.getvalue()
out.close()
def test_non_existing_user(self):
out = StringIO.StringIO()
fake_username = ''
while fake_username == '' or User.objects.filter(username=fake_username).exists():
fake_username = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(6))
arg = '--user=' + fake_username
call_command('create_oauth2_token', arg, stdout=out)
assert 'The user does not exist.' == out.getvalue().strip()
out.close()
def test_correct_user(self, alice):
out = StringIO.StringIO()
arg = '--user=' + 'alice'
call_command('create_oauth2_token', arg, stdout=out)
generated_token = out.getvalue().strip()
assert OAuth2AccessToken.objects.filter(user=alice, token=generated_token).count() == 1
assert OAuth2AccessToken.objects.get(user=alice, token=generated_token).scope == 'write'
out.close()