ソースを参照

Casi preparado para passkeys

Tino 6 ヶ月 前
親
コミット
8a4ee33d0d

+ 1 - 1
K8S/.current_version

@@ -1 +1 @@
-alpine-2
+alpine-11

+ 1 - 1
K8S/.version

@@ -1 +1 @@
-alpine-3
+alpine-12

+ 1 - 0
src/requirements.txt

@@ -23,3 +23,4 @@ tzdata==2025.3
 weasyprint==68.0
 webencodings==0.5.1
 zopfli==0.4.0
+django-passkeys>=2.1

+ 8 - 0
src/reymota/settings.py

@@ -13,6 +13,7 @@ https://docs.djangoproject.com/en/5.1/ref/settings/
 from pathlib import Path
 import os
 import logging
+import passkeys
 
 
 APP_NAME = "Reymota.es"
@@ -54,6 +55,7 @@ INSTALLED_APPS = [
     'reymotausers',
     'lyrics',
 
+    'passkeys',
     'rest_framework',
 ]
 
@@ -158,6 +160,12 @@ LOGIN_URL = '/accounts/login/'
 LOGIN_REDIRECT_URL = 'principal'
 LOGOUT_REDIRECT_URL = 'principal'
 
+AUTHENTICATION_BACKENDS = ['passkeys.backend.PasskeyModelBackend']
+
+FIDO_SERVER_ID="nc.reymota.es"      # Server rp id for FIDO2, it the full domain of your project
+FIDO_SERVER_NAME="TestApp"
+KEY_ATTACHMENT = None  # Set None to allow all authenticator attachment
+
 AUTH_USER_MODEL = "reymotausers.ReyMotaUser"
 
 MEDIA_ROOT = BASE_DIR / "mediafiles"

+ 1 - 0
src/reymota/urls.py

@@ -24,6 +24,7 @@ from . import views
 
 urlpatterns = [
     path('marcelo/', admin.site.urls),
+    path(r'^passkeys/', include('passkeys.urls')),
 
     path('repostajes/', include('repostajes.urls')),
 

+ 0 - 123
src/templates/_cabecera.html

@@ -1,123 +0,0 @@
-{% load static %}
-
-<header class="app-header fixed-top">	   	            
-    <div class="app-header-inner">  
-        <div class="container-fluid py-2">
-            <div class="app-header-content"> 
-                <div class="row justify-content-between align-items-center">
-                
-                    <div class="col-auto">
-                        <a id="sidepanel-toggler" class="sidepanel-toggler d-inline-block d-xl-none" href="#">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30" role="img"><title>Menu</title><path stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M4 7h22M4 15h22M4 23h22"></path></svg>
-                        </a>
-                    </div><!--//col-->
-
-                    {% block menuapp %}
-		            <div class="search-mobile-trigger d-sm-none col">
-			            <i class="search-mobile-trigger-icon fa-solid fa-magnifying-glass"></i>
-			        </div><!--//col-->
-		            <div class="app-search-box col">
-		                <form class="app-search-form">   
-							<input type="text" placeholder="Busca..." name="search" class="form-control search-input">
-							<button type="submit" class="btn search-btn btn-primary" value="Search"><i class="fa-solid fa-magnifying-glass"></i></button> 
-				        </form>
-		            </div><!--//app-search-box-->
-                    {% endblock menuapp %}
-
-                    <div class="app-utilities col-auto">
-                        <div class="app-utility-item app-user-dropdown dropdown">
-                            {% if user.is_authenticated %}
-                            <a class="dropdown-toggle" id="user-dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><img src=" {{user.foto.url }}"></a>
-                            {% else %}
-                            <a class="dropdown-toggle" id="user-dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">Sin usuario</a>
-                            {% endif %}
-                            <ul class="dropdown-menu" aria-labelledby="user-dropdown-toggle">
-                                {% if user.is_authenticated %}
-                                <li>
-                                    <a class="dropdown-item">{{ user.nombre }}</a>
-                                </li>
-                                <li><a class="dropdown-item">                        
-                                    <form method="post" action="{% url 'logout' %}" >
-                                        {% csrf_token %}
-                                        <button
-                                        style="background: none!important;
-                                                    border: none;
-                                                    padding: 0!important;
-                                                    /*optional*/
-                                                    font-family: arial, sans-serif;
-                                                    /*input has OS specific font-family*/
-                                                    /*color: #069;
-                                                    text-decoration: underline;*/
-                                                    cursor: pointer;"   
-                                            
-                                        type="submit">Salir</button>
-                                    </form></a>
-                                </li>
-                                {% else %}
-                                <li><a class="dropdown-item" href="{% url 'login' %}">Entrar</a></li>
-                                {% endif %} 
-                            </ul>
-                        </div><!--//app-user-dropdown--> 
-                    </div><!--//app-utilities-->
-
-                </div><!--//row-->
-            </div><!--//app-header-content-->
-        </div><!--//container-fluid-->
-    </div><!--//app-header-inner-->
-
-    <div id="app-sidepanel" class="app-sidepanel"> 
-        <div id="sidepanel-drop" class="sidepanel-drop"></div>
-        <div class="sidepanel-inner d-flex flex-column">
-            <a href="#" id="sidepanel-close" class="sidepanel-close d-xl-none">&times;</a>
-
-            {% include "_branding.html"  %}
-            
-            <nav id="app-nav-main" class="app-nav app-nav-main flex-grow-1">
-                <ul class="app-menu list-unstyled accordion" id="menu-accordion">
-                    <li class="nav-item">
-                        <!--//Bootstrap Icons: https://icons.getbootstrap.com/ -->
-                        <a class="nav-link active" href="{% url 'principal' %}">
-                            <span class="nav-icon">
-                            <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-house-door" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-      <path fill-rule="evenodd" d="M7.646 1.146a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 .146.354v7a.5.5 0 0 1-.5.5H9.5a.5.5 0 0 1-.5-.5v-4H7v4a.5.5 0 0 1-.5.5H2a.5.5 0 0 1-.5-.5v-7a.5.5 0 0 1 .146-.354l6-6zM2.5 7.707V14H6v-4a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 .5.5v4h3.5V7.707L8 2.207l-5.5 5.5z"/>
-      <path fill-rule="evenodd" d="M13 2.5V6l-2-2V2.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5z"/>
-    </svg>
-                             </span>
-                             <span class="nav-link-text">Principal</span>
-                        </a><!--//nav-link-->
-                    </li><!--//nav-item-->
-
-                    {% if user.is_authenticated %}
-
-                    <li class="nav-item has-submenu">
-                        <!--//Bootstrap Icons: https://icons.getbootstrap.com/ -->
-                        <a class="nav-link submenu-toggle" href="#" data-bs-toggle="collapse" data-bs-target="#submenu-1" aria-expanded="false" aria-controls="submenu-1">
-                            <span class="nav-icon">
-                            <!--//Bootstrap Icons: https://icons.getbootstrap.com/ -->
-                            <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-files" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" d="M4 2h7a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2zm0 1a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h7a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4z"/>
-  <path d="M6 0h7a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2v-1a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H6a1 1 0 0 0-1 1H4a2 2 0 0 1 2-2z"/>
-</svg>
-                             </span>
-                             <span class="nav-link-text">Aplicaciones</span>
-                             <span class="submenu-arrow">
-                                 <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-chevron-down" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z"/>
-</svg>
-                             </span><!--//submenu-arrow-->
-                        </a><!--//nav-link-->
-                        <div id="submenu-1" class="collapse submenu submenu-1" data-bs-parent="#menu-accordion">
-                            <ul class="submenu-list list-unstyled">
-                                <li class="submenu-item"><a class="submenu-link" href="{% url 'libros:principal' %}">Libros</a></li>
-                                <li class="submenu-item"><a class="submenu-link" href="{% url 'repostajes:principal' %}">Vehículos</a></li>
-                                <li class="submenu-item"><a class="submenu-link" href="{% url 'lyrics:principal' %}">Letras</a></li>
-                            </ul>
-                        </div>
-                    </li><!--//nav-item-->
-                    {% endif %}
-                </ul><!--//app-menu-->
-            </nav><!--//app-nav-->           
-        </div><!--//sidepanel-inner-->
-    </div><!--//app-sidepanel-->
-
-</header><!--//app-header-->

+ 1 - 5
src/templates/base.html

@@ -34,6 +34,7 @@
                                 <li>
                                     <a class="dropdown-item">{{ user.nombre }}</a>
                                 </li>
+                                <li><a class="dropdown-item" href="{% url 'passkeys:home' %}">Passkeys</a></li>
                                 <li><a class="dropdown-item">                        
                                     <form method="post" action="{% url 'logout' %}" >
                                         {% csrf_token %}
@@ -106,7 +107,6 @@
                         </a><!--//nav-link-->
                         <div id="submenu-1" class="collapse submenu submenu-1" data-bs-parent="#menu-accordion">
                             <ul class="submenu-list list-unstyled">
-                                <li class="submenu-item"><a class="submenu-link" href="{% url 'repostajes:principal' %}">Vehículos</a></li>
                                 <li class="submenu-item"><a class="submenu-link" href="{% url 'lyrics:principal' %}">Letras</a></li>
                             </ul>
                         </div>
@@ -132,12 +132,8 @@
                         <div id="submenu-1" class="collapse submenu submenu-1" data-bs-parent="#menu-accordion">
                             <ul class="submenu-list list-unstyled">
                                 <li class="submenu-item"><a class="submenu-link" href="https://navidrome.reymota.es" target="_blank">Navidrome</a></li>
-                                <li class="submenu-item"><a class="submenu-link" href="https://firefly.reymota.es" target="_blank">Gestion economica</a></li>
-                                <li class="submenu-item"><a class="submenu-link" href="https://gogs.reymota.es" target="_blank">Control de versiones</a></li>
-                                <li class="submenu-item"><a class="submenu-link" href="https://wordpress.reymota.es" target="_blank">Blog</a></li>
                                 <li class="submenu-item"><a class="submenu-link" href="https://nextcloud.reymota.es" target="_blank">Nextcloud</a></li>
                                 <li class="submenu-item"><a class="submenu-link" href="https://calibre.reymota.es" target="_blank">Libros</a></li>
-                                <li class="submenu-item"><a class="submenu-link" href="http://reymota.ddns.net:30825" target="_blank">Recetas</a></li>
                             </ul>
                         </div>
                     </li><!--//nav-item-->

+ 5 - 0
src/templates/registration/login.html

@@ -60,6 +60,11 @@
                             <div class="text-center">
                                 <input type="submit" class="btn app-btn-primary w-100 theme-btn mx-auto" value="{% translate 'Log in' %}">
                             </div>
+                            <div class="text-center">
+			     <input type="hidden" name="passkeys" id="passkeys"/>
+ <button class="btn btn-block btn-dark" type="button" onclick="authn('login-form')"><img src="{% static 'passkeys/imgs/FIDO-Passkey_Icon-White.png' %}" style="width: 24px"/> Login by Passkeys </button>
+ {%include 'passkeys/passkeys.js' %}
+                            </div>
                         </form>
                     </div>
                 </div>