Browse Source

Give better 'me' normalisation to IndieAuth processing + Aadd a simple POST route for actually submitting the form

pull/1/head
Danielle McLean 4 years ago
parent
commit
221d548e4a
Signed by: 00dani GPG Key ID: 5A5D2D1AFF12EEC5
  1. 12
      lemonauth/templates/lemonauth/indie.html
  2. 1
      lemonauth/urls.py
  3. 2
      lemonauth/views/__init__.py
  4. 44
      lemonauth/views/indie.py

12
lemonauth/templates/lemonauth/indie.html

@ -7,7 +7,7 @@
{% block main %}
<div class="container">
<form class="card" method="post" action="{% url 'lemonauth:indie' %}">
<form class="card" method="post" action="{% url 'lemonauth:indie_approve' %}">
<h4 class="card-header h-x-app">
{% if app %}<img class="u-logo p-name" src="{{ app.logo | first }}" alt="{{ app.name | first }}" />{% endif %}
sign in to
@ -16,7 +16,7 @@
</h4>
<div class="card-body">
<p class="card-text">do you want to confirm your identity, <a class="code" href="{{ params.me }}">{{ params.me }}</a>, with this app?</p>
<p class="card-text">do you want to confirm your identity, <a class="code" href="{{ me }}">{{ me }}</a>, with this app?</p>
<p class="card-text"><small>you will be redirected to <a class="code" href="{{ params.redirect_uri }}">{{ params.redirect_uri }}</a> after authorising this app</small></p>
</div>
@ -28,9 +28,11 @@
</div>
{% csrf_token %}
{% if params.state %}
<input name="state" type="hidden" value="{{ params.state }}" />
{% endif %}
<input name="me" type="hidden" value="{{ me }}" />
<input name="client_id" type="hidden" value="{{ params.client_id }}" />
<input name="redirect_uri" type="hidden" value="{{ params.redirect_uri }}" />
{% if params.state %}<input name="state" type="hidden" value="{{ params.state }}" />{% endif %}
<input name="response_type" type="hidden" value="{{ params.response_type }}" />
</form>
</div>
{% endblock %}

1
lemonauth/urls.py

@ -6,4 +6,5 @@ urlpatterns = [
url('^login$', views.login, name='login'),
url('^logout$', views.logout, name='logout'),
url('^indie$', views.IndieView.as_view(), name='indie'),
url('^indie/approve$', views.indie_approve, name='indie_approve'),
]

2
lemonauth/views/__init__.py

@ -1,3 +1,3 @@
from .login import login
from .logout import logout
from .indie import IndieView
from .indie import IndieView, approve as indie_approve

44
lemonauth/views/indie.py

@ -1,23 +1,39 @@
import mf2py
from annoying.decorators import render_to
from django.contrib.auth.decorators import login_required
from django.http import HttpResponseForbidden, HttpResponseBadRequest
from django.shortcuts import render
from django.http import JsonResponse
from django.utils.decorators import method_decorator
from django.views.generic import TemplateView
from django.views.decorators.http import require_POST
from lemoncurry import breadcrumbs, utils
from urllib.parse import urljoin
from urllib.parse import urljoin, urlunparse, urlparse
breadcrumbs.add('lemonauth:indie', label='indieauth', parent='home:index')
def canonical(url):
(scheme, loc, path, params, q, fragment) = urlparse(url)
if not path:
path = '/'
if not loc:
loc, path = path, ''
if not scheme:
scheme = 'https'
return urlunparse((scheme, loc, path, params, q, fragment))
class IndieView(TemplateView):
template_name = 'lemonauth/indie.html'
required_params = ('me', 'client_id', 'redirect_uri')
@method_decorator(login_required)
@method_decorator(render_to(template_name))
def get(self, request):
params = request.GET
params = request.GET.dict()
params.setdefault('response_type', 'id')
for param in self.required_params:
if param not in params:
return HttpResponseBadRequest(
@ -25,13 +41,9 @@ class IndieView(TemplateView):
content_type='text/plain',
)
me = params['me']
if me[-1] == '/':
me = me[:-1]
origin = utils.origin(request)
user = urljoin(origin, request.user.url)
if user not in (me, me + '/'):
me = canonical(params['me'])
user = urljoin(utils.origin(request), request.user.url)
if user != me:
return HttpResponseForbidden(
'you are logged in but not as {0}'.format(me),
content_type='text/plain',
@ -52,8 +64,10 @@ class IndieView(TemplateView):
except IndexError:
app = None
return render(request, self.template_name, {
'app': app,
'params': params,
'title': 'indieauth',
})
return {'app': app, 'me': me, 'params': params, 'title': 'indieauth'}
@login_required
@require_POST
def approve(request):
return JsonResponse(request.POST)

Loading…
Cancel
Save