{{ tb }}
+ {{ tb }}{{ error }}
{% endif %}
diff --git a/passbook/lib/templatetags/passbook_utils.py b/passbook/lib/templatetags/passbook_utils.py
index 6acca985b..2effddc1c 100644
--- a/passbook/lib/templatetags/passbook_utils.py
+++ b/passbook/lib/templatetags/passbook_utils.py
@@ -85,7 +85,6 @@ def verbose_name(obj) -> str:
if not obj:
return ""
if hasattr(obj, "verbose_name"):
- print(obj.verbose_name)
return obj.verbose_name
return obj._meta.verbose_name
diff --git a/passbook/lib/views.py b/passbook/lib/views.py
index c816b70fe..a82ec9e84 100644
--- a/passbook/lib/views.py
+++ b/passbook/lib/views.py
@@ -26,11 +26,13 @@ class CreateAssignPermView(CreateView):
return response
-def bad_request_message(request: HttpRequest, message: str) -> TemplateResponse:
+def bad_request_message(
+ request: HttpRequest, message: str, title="Bad Request"
+) -> TemplateResponse:
"""Return generic error page with message, with status code set to 400"""
return TemplateResponse(
request,
"error/generic.html",
- {"message": message, "card_title": _("Bad Request")},
+ {"message": message, "card_title": _(title)},
status=400,
)
diff --git a/passbook/policies/hibp/tests.py b/passbook/policies/hibp/tests.py
index 6c70256d1..0e79ac3fe 100644
--- a/passbook/policies/hibp/tests.py
+++ b/passbook/policies/hibp/tests.py
@@ -1,10 +1,10 @@
"""HIBP Policy tests"""
from django.test import TestCase
from guardian.shortcuts import get_anonymous_user
-from oauth2_provider.generators import generate_client_secret
from passbook.policies.hibp.models import HaveIBeenPwendPolicy
from passbook.policies.types import PolicyRequest, PolicyResult
+from passbook.providers.oauth2.generators import generate_client_secret
class TestHIBPPolicy(TestCase):
diff --git a/passbook/providers/app_gw/api.py b/passbook/providers/app_gw/api.py
deleted file mode 100644
index c4694f8b9..000000000
--- a/passbook/providers/app_gw/api.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""ApplicationGatewayProvider API Views"""
-from oauth2_provider.generators import generate_client_id, generate_client_secret
-from oidc_provider.models import Client
-from rest_framework.serializers import ModelSerializer
-from rest_framework.viewsets import ModelViewSet
-
-from passbook.providers.app_gw.models import ApplicationGatewayProvider
-from passbook.providers.oidc.api import OpenIDProviderSerializer
-
-
-class ApplicationGatewayProviderSerializer(ModelSerializer):
- """ApplicationGatewayProvider Serializer"""
-
- client = OpenIDProviderSerializer()
-
- def create(self, validated_data):
- instance = super().create(validated_data)
- instance.client = Client.objects.create(
- client_id=generate_client_id(), client_secret=generate_client_secret()
- )
- instance.save()
- return instance
-
- def update(self, instance, validated_data):
- self.instance.client.name = self.instance.name
- self.instance.client.redirect_uris = [
- f"http://{self.instance.host}/oauth2/callback",
- f"https://{self.instance.host}/oauth2/callback",
- ]
- self.instance.client.scope = ["openid", "email"]
- self.instance.client.save()
- return super().update(instance, validated_data)
-
- class Meta:
-
- model = ApplicationGatewayProvider
- fields = ["pk", "name", "internal_host", "external_host", "client"]
- read_only_fields = ["client"]
-
-
-class ApplicationGatewayProviderViewSet(ModelViewSet):
- """ApplicationGatewayProvider Viewset"""
-
- queryset = ApplicationGatewayProvider.objects.all()
- serializer_class = ApplicationGatewayProviderSerializer
diff --git a/passbook/providers/app_gw/apps.py b/passbook/providers/app_gw/apps.py
deleted file mode 100644
index a1702dcf9..000000000
--- a/passbook/providers/app_gw/apps.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""passbook Application Security Gateway app"""
-from django.apps import AppConfig
-
-
-class PassbookApplicationApplicationGatewayConfig(AppConfig):
- """passbook app_gw app"""
-
- name = "passbook.providers.app_gw"
- label = "passbook_providers_app_gw"
- verbose_name = "passbook Providers.Application Security Gateway"
- mountpoint = "application/gateway/"
diff --git a/passbook/providers/app_gw/forms.py b/passbook/providers/app_gw/forms.py
deleted file mode 100644
index a523d78d1..000000000
--- a/passbook/providers/app_gw/forms.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""passbook Application Security Gateway Forms"""
-from django import forms
-from oauth2_provider.generators import generate_client_id, generate_client_secret
-from oidc_provider.models import Client, ResponseType
-
-from passbook.providers.app_gw.models import ApplicationGatewayProvider
-
-
-class ApplicationGatewayProviderForm(forms.ModelForm):
- """Security Gateway Provider form"""
-
- def save(self, *args, **kwargs):
- if not self.instance.pk:
- # New instance, so we create a new OIDC client with random keys
- self.instance.client = Client.objects.create(
- client_id=generate_client_id(), client_secret=generate_client_secret()
- )
- self.instance.client.reuse_consent = False # This is managed by passbook
- self.instance.client.require_consent = False # This is managed by passbook
- self.instance.client.name = self.instance.name
- self.instance.client.response_types.set(
- [ResponseType.objects.get_by_natural_key("code")]
- )
- self.instance.client.redirect_uris = [
- f"{self.instance.external_host}/oauth2/callback",
- f"{self.instance.internal_host}/oauth2/callback",
- ]
- self.instance.client.scope = ["openid", "email", "profile"]
- self.instance.client.save()
- return super().save(*args, **kwargs)
-
- class Meta:
-
- model = ApplicationGatewayProvider
- fields = ["name", "authorization_flow", "internal_host", "external_host"]
- widgets = {
- "name": forms.TextInput(),
- "internal_host": forms.TextInput(),
- "external_host": forms.TextInput(),
- }
diff --git a/passbook/providers/app_gw/migrations/0001_initial.py b/passbook/providers/app_gw/migrations/0001_initial.py
deleted file mode 100644
index a5c6d746d..000000000
--- a/passbook/providers/app_gw/migrations/0001_initial.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Generated by Django 3.0.6 on 2020-05-19 22:08
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- initial = True
-
- dependencies = [
- ("oidc_provider", "0026_client_multiple_response_types"),
- ("passbook_core", "0001_initial"),
- ]
-
- operations = [
- migrations.CreateModel(
- name="ApplicationGatewayProvider",
- fields=[
- (
- "provider_ptr",
- models.OneToOneField(
- auto_created=True,
- on_delete=django.db.models.deletion.CASCADE,
- parent_link=True,
- primary_key=True,
- serialize=False,
- to="passbook_core.Provider",
- ),
- ),
- ("name", models.TextField()),
- ("internal_host", models.TextField()),
- ("external_host", models.TextField()),
- (
- "client",
- models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE,
- to="oidc_provider.Client",
- ),
- ),
- ],
- options={
- "verbose_name": "Application Gateway Provider",
- "verbose_name_plural": "Application Gateway Providers",
- },
- bases=("passbook_core.provider",),
- ),
- ]
diff --git a/passbook/providers/app_gw/migrations/0002_auto_20200726_1745.py b/passbook/providers/app_gw/migrations/0002_auto_20200726_1745.py
deleted file mode 100644
index 09816b0dc..000000000
--- a/passbook/providers/app_gw/migrations/0002_auto_20200726_1745.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 3.0.8 on 2020-07-26 17:45
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ("passbook_providers_app_gw", "0001_initial"),
- ]
-
- operations = [
- migrations.AlterField(
- model_name="applicationgatewayprovider",
- name="external_host",
- field=models.TextField(validators=[django.core.validators.URLValidator]),
- ),
- migrations.AlterField(
- model_name="applicationgatewayprovider",
- name="internal_host",
- field=models.TextField(validators=[django.core.validators.URLValidator]),
- ),
- ]
diff --git a/passbook/providers/app_gw/migrations/0003_auto_20200801_1752.py b/passbook/providers/app_gw/migrations/0003_auto_20200801_1752.py
deleted file mode 100644
index 60bf0431f..000000000
--- a/passbook/providers/app_gw/migrations/0003_auto_20200801_1752.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated by Django 3.0.8 on 2020-08-01 17:52
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ("passbook_providers_app_gw", "0002_auto_20200726_1745"),
- ]
-
- operations = [
- migrations.AlterField(
- model_name="applicationgatewayprovider",
- name="external_host",
- field=models.TextField(
- validators=[
- django.core.validators.URLValidator(schemes=("http", "https"))
- ]
- ),
- ),
- migrations.AlterField(
- model_name="applicationgatewayprovider",
- name="internal_host",
- field=models.TextField(
- validators=[
- django.core.validators.URLValidator(schemes=("http", "https"))
- ]
- ),
- ),
- ]
diff --git a/passbook/providers/app_gw/models.py b/passbook/providers/app_gw/models.py
deleted file mode 100644
index 4c6836bf0..000000000
--- a/passbook/providers/app_gw/models.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""passbook app_gw models"""
-from typing import Optional, Type
-
-from django.core.validators import URLValidator
-from django.db import models
-from django.forms import ModelForm
-from django.http import HttpRequest
-from django.utils.translation import gettext as _
-from oidc_provider.models import Client
-
-from passbook.core.models import Provider
-from passbook.lib.utils.template import render_to_string
-
-
-class ApplicationGatewayProvider(Provider):
- """Protect applications that don't support any of the other
- Protocols by using a Reverse-Proxy."""
-
- name = models.TextField()
- internal_host = models.TextField(
- validators=[URLValidator(schemes=("http", "https"))]
- )
- external_host = models.TextField(
- validators=[URLValidator(schemes=("http", "https"))]
- )
-
- client = models.ForeignKey(Client, on_delete=models.CASCADE)
-
- def form(self) -> Type[ModelForm]:
- from passbook.providers.app_gw.forms import ApplicationGatewayProviderForm
-
- return ApplicationGatewayProviderForm
-
- def html_setup_urls(self, request: HttpRequest) -> Optional[str]:
- """return template and context modal with URLs for authorize, token, openid-config, etc"""
- from passbook.providers.app_gw.views import DockerComposeView
-
- docker_compose_yaml = DockerComposeView(request=request).get_compose(self)
- return render_to_string(
- "app_gw/setup_modal.html",
- {"provider": self, "docker_compose": docker_compose_yaml},
- )
-
- def __str__(self):
- return self.name
-
- class Meta:
-
- verbose_name = _("Application Gateway Provider")
- verbose_name_plural = _("Application Gateway Providers")
diff --git a/passbook/providers/oauth/api.py b/passbook/providers/oauth/api.py
deleted file mode 100644
index 9647b88d3..000000000
--- a/passbook/providers/oauth/api.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""OAuth2Provider API Views"""
-from rest_framework.serializers import ModelSerializer
-from rest_framework.viewsets import ModelViewSet
-
-from passbook.providers.oauth.models import OAuth2Provider
-
-
-class OAuth2ProviderSerializer(ModelSerializer):
- """OAuth2Provider Serializer"""
-
- class Meta:
-
- model = OAuth2Provider
- fields = [
- "pk",
- "name",
- "redirect_uris",
- "client_type",
- "authorization_grant_type",
- "client_id",
- "client_secret",
- ]
-
-
-class OAuth2ProviderViewSet(ModelViewSet):
- """OAuth2Provider Viewset"""
-
- queryset = OAuth2Provider.objects.all()
- serializer_class = OAuth2ProviderSerializer
diff --git a/passbook/providers/oauth/apps.py b/passbook/providers/oauth/apps.py
deleted file mode 100644
index b3f6ccdda..000000000
--- a/passbook/providers/oauth/apps.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""passbook auth oauth provider app config"""
-
-from django.apps import AppConfig
-
-
-class PassbookProviderOAuthConfig(AppConfig):
- """passbook auth oauth provider app config"""
-
- name = "passbook.providers.oauth"
- label = "passbook_providers_oauth"
- verbose_name = "passbook Providers.OAuth"
- mountpoint = ""
diff --git a/passbook/providers/oauth/forms.py b/passbook/providers/oauth/forms.py
deleted file mode 100644
index 8c470ef08..000000000
--- a/passbook/providers/oauth/forms.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""passbook OAuth2 Provider Forms"""
-
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from passbook.flows.models import Flow, FlowDesignation
-from passbook.providers.oauth.models import OAuth2Provider
-
-
-class OAuth2ProviderForm(forms.ModelForm):
- """OAuth2 Provider form"""
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.fields["authorization_flow"].queryset = Flow.objects.filter(
- designation=FlowDesignation.AUTHORIZATION
- )
-
- class Meta:
-
- model = OAuth2Provider
- fields = [
- "name",
- "authorization_flow",
- "redirect_uris",
- "client_type",
- "authorization_grant_type",
- "client_id",
- "client_secret",
- ]
- labels = {
- "client_id": _("Client ID"),
- "redirect_uris": _("Redirect URIs"),
- }
diff --git a/passbook/providers/oauth/migrations/0001_initial.py b/passbook/providers/oauth/migrations/0001_initial.py
deleted file mode 100644
index 7c3e7d1c3..000000000
--- a/passbook/providers/oauth/migrations/0001_initial.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by Django 3.0.6 on 2020-05-19 22:08
-
-import django.db.models.deletion
-import oauth2_provider.generators
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- initial = True
-
- run_before = [
- ("oauth2_provider", "0001_initial"),
- ]
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ("passbook_core", "0001_initial"),
- ]
-
- operations = [
- migrations.CreateModel(
- name="OAuth2Provider",
- fields=[
- (
- "provider_ptr",
- models.OneToOneField(
- auto_created=True,
- on_delete=django.db.models.deletion.CASCADE,
- parent_link=True,
- primary_key=True,
- serialize=False,
- to="passbook_core.Provider",
- ),
- ),
- (
- "client_id",
- models.CharField(
- db_index=True,
- default=oauth2_provider.generators.generate_client_id,
- max_length=100,
- unique=True,
- ),
- ),
- (
- "redirect_uris",
- models.TextField(
- blank=True, help_text="Allowed URIs list, space separated"
- ),
- ),
- (
- "client_type",
- models.CharField(
- choices=[
- ("confidential", "Confidential"),
- ("public", "Public"),
- ],
- max_length=32,
- ),
- ),
- (
- "authorization_grant_type",
- models.CharField(
- choices=[
- ("authorization-code", "Authorization code"),
- ("implicit", "Implicit"),
- ("password", "Resource owner password-based"),
- ("client-credentials", "Client credentials"),
- ],
- max_length=32,
- ),
- ),
- (
- "client_secret",
- models.CharField(
- blank=True,
- db_index=True,
- default=oauth2_provider.generators.generate_client_secret,
- max_length=255,
- ),
- ),
- ("name", models.CharField(blank=True, max_length=255)),
- ("skip_authorization", models.BooleanField(default=False)),
- ("created", models.DateTimeField(auto_now_add=True)),
- ("updated", models.DateTimeField(auto_now=True)),
- (
- "user",
- models.ForeignKey(
- blank=True,
- null=True,
- on_delete=django.db.models.deletion.CASCADE,
- related_name="passbook_providers_oauth_oauth2provider",
- to=settings.AUTH_USER_MODEL,
- ),
- ),
- ],
- options={
- "verbose_name": "OAuth2 Provider",
- "verbose_name_plural": "OAuth2 Providers",
- },
- bases=("passbook_core.provider", models.Model),
- ),
- ]
diff --git a/passbook/providers/oauth/models.py b/passbook/providers/oauth/models.py
deleted file mode 100644
index f1a9ad522..000000000
--- a/passbook/providers/oauth/models.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""Oauth2 provider product extension"""
-
-from typing import Optional, Type
-
-from django.forms import ModelForm
-from django.http import HttpRequest
-from django.shortcuts import reverse
-from django.utils.translation import gettext as _
-from oauth2_provider.models import AbstractApplication
-
-from passbook.core.models import Provider
-from passbook.lib.utils.template import render_to_string
-
-
-class OAuth2Provider(Provider, AbstractApplication):
- """Generic OAuth2 Provider for applications not using OpenID-Connect.
- This Provider also supports the GitHub-pretend mode for Applications that don't support
- generic OAuth."""
-
- def form(self) -> Type[ModelForm]:
- from passbook.providers.oauth.forms import OAuth2ProviderForm
-
- return OAuth2ProviderForm
-
- def __str__(self):
- return self.name
-
- def html_setup_urls(self, request: HttpRequest) -> Optional[str]:
- """return template and context modal with URLs for authorize, token, openid-config, etc"""
- return render_to_string(
- "providers/oauth/setup_url_modal.html",
- {
- "provider": self,
- "authorize_url": request.build_absolute_uri(
- reverse("passbook_providers_oauth:oauth2-authorize")
- ),
- "token_url": request.build_absolute_uri(
- reverse("passbook_providers_oauth:token")
- ),
- "userinfo_url": request.build_absolute_uri(
- reverse("passbook_api:openid")
- ),
- },
- )
-
- class Meta:
-
- verbose_name = _("OAuth2 Provider")
- verbose_name_plural = _("OAuth2 Providers")
diff --git a/passbook/providers/oauth/settings.py b/passbook/providers/oauth/settings.py
deleted file mode 100644
index 925787a30..000000000
--- a/passbook/providers/oauth/settings.py
+++ /dev/null
@@ -1,31 +0,0 @@
-"""passbook OAuth_Provider"""
-from django.conf import settings
-
-CORS_ORIGIN_ALLOW_ALL = settings.DEBUG
-
-REQUEST_APPROVAL_PROMPT = "auto"
-
-INSTALLED_APPS = [
- "oauth2_provider",
- "corsheaders",
-]
-MIDDLEWARE = [
- "oauth2_provider.middleware.OAuth2TokenMiddleware",
- "corsheaders.middleware.CorsMiddleware",
-]
-AUTHENTICATION_BACKENDS = [
- "oauth2_provider.backends.OAuth2Backend",
-]
-
-OAUTH2_PROVIDER_APPLICATION_MODEL = "passbook_providers_oauth.OAuth2Provider"
-
-OAUTH2_PROVIDER = {
- # this is the list of available scopes
- "SCOPES": {
- "openid": "Access OpenID Userinfo",
- "userinfo": "Access OpenID Userinfo",
- "email": "Access OpenID Email",
- "user:email": "GitHub Compatibility: User Email",
- "read:org": "GitHub Compatibility: User Groups",
- }
-}
diff --git a/passbook/providers/oauth/templates/providers/oauth/setup_url_modal.html b/passbook/providers/oauth/templates/providers/oauth/setup_url_modal.html
deleted file mode 100644
index 26419ba45..000000000
--- a/passbook/providers/oauth/templates/providers/oauth/setup_url_modal.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% load i18n %}
-
-
-