core: make autosubmit_form generic template

This commit is contained in:
Jens Langhammer 2020-07-08 14:27:32 +02:00
parent 1e57926603
commit d831599608
6 changed files with 22 additions and 16 deletions

View File

@ -4,9 +4,7 @@
{% load i18n %} {% load i18n %}
{% block title %} {% block title %}
{% blocktrans with app=application.name %} {{ title }}
Redirecting to {{ app }}...
{% endblocktrans %}
{% endblock %} {% endblock %}
{% block card %} {% block card %}

View File

@ -7,6 +7,7 @@ from django.http import HttpRequest, HttpResponse
from django.shortcuts import get_object_or_404, redirect, render, reverse from django.shortcuts import get_object_or_404, redirect, render, reverse
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.translation import gettext_lazy as _
from django.views import View from django.views import View
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from signxml.util import strip_pem_header from signxml.util import strip_pem_header
@ -190,10 +191,10 @@ class SAMLFlowFinalView(StageView):
if provider.sp_binding == SAMLBindings.POST: if provider.sp_binding == SAMLBindings.POST:
return render( return render(
self.request, self.request,
"providers/saml/autosubmit_form.html", "generic/autosubmit_form.html",
{ {
"url": response.acs_url, "url": response.acs_url,
"application": application, "title": _("Redirecting to %(app)s..." % {"app": application.name}),
"attrs": { "attrs": {
"ACSUrl": response.acs_url, "ACSUrl": response.acs_url,
SESSION_KEY_SAML_RESPONSE: response.saml_response, SESSION_KEY_SAML_RESPONSE: response.saml_response,

View File

@ -2,8 +2,8 @@
from django import forms from django import forms
from passbook.flows.models import Flow, FlowDesignation
from passbook.admin.forms.source import SOURCE_FORM_FIELDS from passbook.admin.forms.source import SOURCE_FORM_FIELDS
from passbook.flows.models import Flow, FlowDesignation
from passbook.sources.saml.models import SAMLSource from passbook.sources.saml.models import SAMLSource

View File

@ -6,13 +6,21 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('passbook_sources_saml', '0003_auto_20200624_1957'), ("passbook_sources_saml", "0003_auto_20200624_1957"),
] ]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name='samlsource', model_name="samlsource",
name='binding_type', name="binding_type",
field=models.CharField(choices=[('REDIRECT', 'Redirect Binding'), ('POST', 'POST Binding'), ('POST_AUTO', 'POST Binding with auto-confirmation')], default='REDIRECT', max_length=100), field=models.CharField(
choices=[
("REDIRECT", "Redirect Binding"),
("POST", "POST Binding"),
("POST_AUTO", "POST Binding with auto-confirmation"),
],
default="REDIRECT",
max_length=100,
),
), ),
] ]

View File

@ -5,6 +5,7 @@ from django.http import Http404, HttpRequest, HttpResponse
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.translation import gettext_lazy as _
from django.views import View from django.views import View
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from signxml import InvalidSignature from signxml import InvalidSignature
@ -64,13 +65,10 @@ class InitiateView(View):
if source.binding_type == SAMLBindingTypes.POST_AUTO: if source.binding_type == SAMLBindingTypes.POST_AUTO:
return render( return render(
request, request,
"providers/saml/autosubmit_form.html", "generic/autosubmit_form.html",
{ {
"application": source, "title": _("Redirecting to %(app)s..." % {"app": source.name}),
"attrs": { "attrs": {"SAMLRequest": _request, "RelayState": relay_state},
"SAMLRequest": _request,
"RelayState": relay_state,
},
"url": source.sso_url, "url": source.sso_url,
}, },
) )

View File

@ -6511,6 +6511,7 @@ definitions:
enum: enum:
- REDIRECT - REDIRECT
- POST - POST
- POST_AUTO
slo_url: slo_url:
title: SLO URL title: SLO URL
description: Optional URL if your IDP supports Single-Logout. description: Optional URL if your IDP supports Single-Logout.