Compare commits
	
		
			4 Commits
		
	
	
		
			version/0.
			...
			version/0.
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| d50c7ec8d4 | |||
| c0fdf377d1 | |||
| 70c11c8988 | |||
| 67b19becc1 | 
@ -1,5 +1,5 @@
 | 
				
			|||||||
[bumpversion]
 | 
					[bumpversion]
 | 
				
			||||||
current_version = 0.1.18-beta
 | 
					current_version = 0.1.19-beta
 | 
				
			||||||
tag = True
 | 
					tag = True
 | 
				
			||||||
commit = True
 | 
					commit = True
 | 
				
			||||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-(?P<release>.*)
 | 
					parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-(?P<release>.*)
 | 
				
			||||||
 | 
				
			|||||||
@ -54,7 +54,7 @@ package-docker:
 | 
				
			|||||||
    before_script:
 | 
					    before_script:
 | 
				
			||||||
        - echo "{\"auths\":{\"docker.$NEXUS_URL\":{\"auth\":\"$NEXUS_AUTH\"}}}" > /kaniko/.docker/config.json
 | 
					        - echo "{\"auths\":{\"docker.$NEXUS_URL\":{\"auth\":\"$NEXUS_AUTH\"}}}" > /kaniko/.docker/config.json
 | 
				
			||||||
    script:
 | 
					    script:
 | 
				
			||||||
        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.pkg.beryju.org/passbook:latest --destination docker.pkg.beryju.org/passbook:0.1.18-beta
 | 
					        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.pkg.beryju.org/passbook:latest --destination docker.pkg.beryju.org/passbook:0.1.19-beta
 | 
				
			||||||
    stage: build
 | 
					    stage: build
 | 
				
			||||||
    only:
 | 
					    only:
 | 
				
			||||||
        - tags
 | 
					        - tags
 | 
				
			||||||
 | 
				
			|||||||
@ -3,7 +3,7 @@ from setuptools import setup
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
setup(
 | 
					setup(
 | 
				
			||||||
    name='django-allauth-passbook',
 | 
					    name='django-allauth-passbook',
 | 
				
			||||||
    version='0.1.18-beta',
 | 
					    version='0.1.19-beta',
 | 
				
			||||||
    description='passbook support for django-allauth',
 | 
					    description='passbook support for django-allauth',
 | 
				
			||||||
    # long_description='\n'.join(read_simple('docs/index.md')[2:]),
 | 
					    # long_description='\n'.join(read_simple('docs/index.md')[2:]),
 | 
				
			||||||
    long_description_content_type='text/markdown',
 | 
					    long_description_content_type='text/markdown',
 | 
				
			||||||
 | 
				
			|||||||
@ -8,13 +8,13 @@ from sentry.utils import json
 | 
				
			|||||||
from .constants import BASE_DOMAIN
 | 
					from .constants import BASE_DOMAIN
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class SupervisrApiError(Exception):
 | 
					class PassbookApiError(Exception):
 | 
				
			||||||
    def __init__(self, message='', status=0):
 | 
					    def __init__(self, message='', status=0):
 | 
				
			||||||
        super(SupervisrApiError, self).__init__(message)
 | 
					        super(PassbookApiError, self).__init__(message)
 | 
				
			||||||
        self.status = status
 | 
					        self.status = status
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class SupervisrClient(object):
 | 
					class PassbookClient(object):
 | 
				
			||||||
    def __init__(self, client_id, client_secret):
 | 
					    def __init__(self, client_id, client_secret):
 | 
				
			||||||
        self.client_id = client_id
 | 
					        self.client_id = client_id
 | 
				
			||||||
        self.client_secret = client_secret
 | 
					        self.client_secret = client_secret
 | 
				
			||||||
@ -36,10 +36,10 @@ class SupervisrClient(object):
 | 
				
			|||||||
                headers=headers,
 | 
					                headers=headers,
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
        except RequestException as e:
 | 
					        except RequestException as e:
 | 
				
			||||||
            raise SupervisrApiError(unicode(e), status=getattr(e, 'status_code', 0))
 | 
					            raise PassbookApiError(unicode(e), status=getattr(e, 'status_code', 0))
 | 
				
			||||||
        if req.status_code < 200 or req.status_code >= 300:
 | 
					        if req.status_code < 200 or req.status_code >= 300:
 | 
				
			||||||
            raise SupervisrApiError(req.content, status=req.status_code)
 | 
					            raise PassbookApiError(req.content, status=req.status_code)
 | 
				
			||||||
        return json.loads(req.content)
 | 
					        return json.loads(req.content)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def get_user(self, access_token):
 | 
					    def get_user(self, access_token):
 | 
				
			||||||
        return self._request('/api/core/v1/accounts/me/?format=openid', access_token)
 | 
					        return self._request('/api/v1/openid/', access_token)
 | 
				
			||||||
 | 
				
			|||||||
@ -18,7 +18,7 @@ tests_require = [
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
setup(
 | 
					setup(
 | 
				
			||||||
    name='sentry-auth-passbook',
 | 
					    name='sentry-auth-passbook',
 | 
				
			||||||
    version='0.1.18-beta',
 | 
					    version='0.1.19-beta',
 | 
				
			||||||
    author='BeryJu.org',
 | 
					    author='BeryJu.org',
 | 
				
			||||||
    author_email='support@beryju.org',
 | 
					    author_email='support@beryju.org',
 | 
				
			||||||
    url='https://passbook.beryju.org',
 | 
					    url='https://passbook.beryju.org',
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										13
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,16 @@
 | 
				
			|||||||
 | 
					passbook (0.1.18) stable; urgency=medium
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  * bump version: 0.1.16-beta -> 0.1.17-beta
 | 
				
			||||||
 | 
					  * fix Server Error when downloading metadata
 | 
				
			||||||
 | 
					  * add sentry client
 | 
				
			||||||
 | 
					  * fix included yaml file
 | 
				
			||||||
 | 
					  * adjust versions for client packages, auto build client-packages
 | 
				
			||||||
 | 
					  * bump version: 0.1.17-beta -> 0.1.18-beta
 | 
				
			||||||
 | 
					  * fix API Call for sentry-client, add missing template
 | 
				
			||||||
 | 
					  * fix GitHub Pretend throwing a 500 error
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 -- Jens Langhammer <jens.langhammer@beryju.org>  Wed, 13 Mar 2019 14:14:10 +0000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
passbook (0.1.17) stable; urgency=medium
 | 
					passbook (0.1.17) stable; urgency=medium
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  * bump version: 0.1.15-beta -> 0.1.16-beta
 | 
					  * bump version: 0.1.15-beta -> 0.1.16-beta
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
apiVersion: v1
 | 
					apiVersion: v1
 | 
				
			||||||
appVersion: "0.1.18-beta"
 | 
					appVersion: "0.1.19-beta"
 | 
				
			||||||
description: A Helm chart for passbook.
 | 
					description: A Helm chart for passbook.
 | 
				
			||||||
name: passbook
 | 
					name: passbook
 | 
				
			||||||
version: "0.1.18-beta"
 | 
					version: "0.1.19-beta"
 | 
				
			||||||
icon: https://passbook.beryju.org/images/logo.png
 | 
					icon: https://passbook.beryju.org/images/logo.png
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@
 | 
				
			|||||||
replicaCount: 1
 | 
					replicaCount: 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
image:
 | 
					image:
 | 
				
			||||||
  tag: 0.1.18-beta
 | 
					  tag: 0.1.19-beta
 | 
				
			||||||
 | 
					
 | 
				
			||||||
nameOverride: ""
 | 
					nameOverride: ""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook"""
 | 
					"""passbook"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook admin"""
 | 
					"""passbook admin"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook api"""
 | 
					"""passbook api"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook audit Header"""
 | 
					"""passbook audit Header"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook captcha_factor Header"""
 | 
					"""passbook captcha_factor Header"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook core"""
 | 
					"""passbook core"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook hibp_policy"""
 | 
					"""passbook hibp_policy"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""Passbook ldap app Header"""
 | 
					"""Passbook ldap app Header"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook lib"""
 | 
					"""passbook lib"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook oauth_client Header"""
 | 
					"""passbook oauth_client Header"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook oauth_provider Header"""
 | 
					"""passbook oauth_provider Header"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook otp Header"""
 | 
					"""passbook otp Header"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook password_expiry"""
 | 
					"""passbook password_expiry"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
@ -1,16 +1,24 @@
 | 
				
			|||||||
"""passbook pretend GitHub Views"""
 | 
					"""passbook pretend GitHub Views"""
 | 
				
			||||||
from django.http import JsonResponse
 | 
					from django.http import JsonResponse
 | 
				
			||||||
 | 
					from django.shortcuts import get_object_or_404
 | 
				
			||||||
from django.views import View
 | 
					from django.views import View
 | 
				
			||||||
 | 
					from oauth2_provider.models import AccessToken
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class GitHubUserView(View):
 | 
					class GitHubUserView(View):
 | 
				
			||||||
    """Emulate GitHub's /user API Endpoint"""
 | 
					    """Emulate GitHub's /user API Endpoint"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def verify_access_token(self):
 | 
				
			||||||
 | 
					        """Verify access token manually since github uses /user?access_token=..."""
 | 
				
			||||||
 | 
					        token = get_object_or_404(AccessToken, token=self.request.get('access_token', ''))
 | 
				
			||||||
 | 
					        return token.user
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def get(self, request):
 | 
					    def get(self, request):
 | 
				
			||||||
        """Emulate GitHub's /user API Endpoint"""
 | 
					        """Emulate GitHub's /user API Endpoint"""
 | 
				
			||||||
 | 
					        user = self.verify_access_token()
 | 
				
			||||||
        return JsonResponse({
 | 
					        return JsonResponse({
 | 
				
			||||||
            "login": request.user.username,
 | 
					            "login": user.username,
 | 
				
			||||||
            "id": request.user.pk,
 | 
					            "id": user.pk,
 | 
				
			||||||
            "node_id": "",
 | 
					            "node_id": "",
 | 
				
			||||||
            "avatar_url": "",
 | 
					            "avatar_url": "",
 | 
				
			||||||
            "gravatar_id": "",
 | 
					            "gravatar_id": "",
 | 
				
			||||||
@ -27,19 +35,19 @@ class GitHubUserView(View):
 | 
				
			|||||||
            "received_events_url": "",
 | 
					            "received_events_url": "",
 | 
				
			||||||
            "type": "User",
 | 
					            "type": "User",
 | 
				
			||||||
            "site_admin": False,
 | 
					            "site_admin": False,
 | 
				
			||||||
            "name": request.user.name,
 | 
					            "name": user.name,
 | 
				
			||||||
            "company": "",
 | 
					            "company": "",
 | 
				
			||||||
            "blog": "",
 | 
					            "blog": "",
 | 
				
			||||||
            "location": "",
 | 
					            "location": "",
 | 
				
			||||||
            "email": request.user.email,
 | 
					            "email": user.email,
 | 
				
			||||||
            "hireable": False,
 | 
					            "hireable": False,
 | 
				
			||||||
            "bio": "",
 | 
					            "bio": "",
 | 
				
			||||||
            "public_repos": 0,
 | 
					            "public_repos": 0,
 | 
				
			||||||
            "public_gists": 0,
 | 
					            "public_gists": 0,
 | 
				
			||||||
            "followers": 0,
 | 
					            "followers": 0,
 | 
				
			||||||
            "following": 0,
 | 
					            "following": 0,
 | 
				
			||||||
            "created_at": request.user.date_joined,
 | 
					            "created_at": user.date_joined,
 | 
				
			||||||
            "updated_at": request.user.date_joined,
 | 
					            "updated_at": user.date_joined,
 | 
				
			||||||
            "private_gists": 0,
 | 
					            "private_gists": 0,
 | 
				
			||||||
            "total_private_repos": 0,
 | 
					            "total_private_repos": 0,
 | 
				
			||||||
            "owned_private_repos": 0,
 | 
					            "owned_private_repos": 0,
 | 
				
			||||||
 | 
				
			|||||||
@ -1,2 +1,2 @@
 | 
				
			|||||||
"""passbook saml_idp Header"""
 | 
					"""passbook saml_idp Header"""
 | 
				
			||||||
__version__ = '0.1.18-beta'
 | 
					__version__ = '0.1.19-beta'
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user