chore: reconfig templates to use openid auth
This commit is contained in:
parent
3faeffda66
commit
a298f5ff4c
@ -1,11 +1,11 @@
|
||||
{% include "partials/header.html.j2" %}
|
||||
<section class="bg-center bg-no-repeat blue-radial bg-gray-700 bg-blend-multiply">
|
||||
<section class="bg-center bg-no-repeat blue-digital bg-gray-700 bg-blend-multiply">
|
||||
<div class="px-4 mx-auto max-w-screen-xl text-center py-24 lg:py-56">
|
||||
<h1 class="flex flex-col space-y-5 mb-4 text-4xl font-extrabold tracking-tight leading-none text-white md:text-5xl lg:text-6xl">
|
||||
{{title | default(value='')}}
|
||||
<div>A Cryptographic Library</div> <div> you can TRust </div>
|
||||
</h1>
|
||||
<div class="flex flex-col space-y-3 my-8 text-lg font-normal text-gray-300 lg:text-xl sm:px-16 lg:px-48">
|
||||
{{subtitle | default(value='')}}
|
||||
<p>Fast, Secure, Agile</p> <p> Customizable to contexts and needs</p>
|
||||
</div>
|
||||
<div class="mt-4 flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0 sm:space-x-4">
|
||||
<a href="#" class="inline-flex justify-center items-center py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
|
||||
@ -26,8 +26,8 @@
|
||||
</svg>
|
||||
Code
|
||||
</a>
|
||||
<h2 class="text-gray-900 dark:text-white text-3xl font-extrabold mb-2"> A Documentation Library </h2>
|
||||
<p class="text-lg font-normal text-gray-500 dark:text-gray-400 mb-4">For production and developers.</p>
|
||||
<h2 class="text-gray-900 dark:text-white text-3xl font-extrabold mb-2"> A modern Cryptographic Library </h2>
|
||||
<p class="text-lg font-normal text-gray-500 dark:text-gray-400 mb-4">Static library for production and developers.</p>
|
||||
<a href="#" class="text-blue-600 dark:text-blue-500 hover:underline font-medium text-lg inline-flex items-center">Read more
|
||||
<svg aria-hidden="true" class="w-4 h-4 ml-2" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M17 8l4 4m0 0l-4 4m4-4H3"></path>
|
||||
|
||||
@ -1,12 +1,15 @@
|
||||
{% include "partials/header.html.j2" %}
|
||||
{% if usr_roles is containing('new') %}
|
||||
{% set logo= assets_url~"/images/logo_new.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo_new.svg" %}
|
||||
{% elif usr_roles is containing('dev') %}
|
||||
{% set logo= assets_url~"/images/logo_dev.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo_dev.svg" %}
|
||||
{% else %}
|
||||
{% set logo= assets_url~"/images/logo.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo.svg" %}
|
||||
{% endif %}
|
||||
<div class="blue-radial">
|
||||
{% if not signin_target %}
|
||||
{% set signin_target = "" %}
|
||||
{% endif %}
|
||||
<div class="blue-digital">
|
||||
{% include "partials/mini_navbar.html.j2" %}
|
||||
<section class="w-auto min-h-200 mt-10%">
|
||||
<div
|
||||
@ -15,7 +18,7 @@
|
||||
<form id="main-form" class="border-1 border-gray-500 bg-white dark:bg-gray-800 shadow-md rounded px-11 pt-6 pb-8 mb-4 -mt-8" onsubmit="return false;">
|
||||
<div
|
||||
class="flex items-center justify-center p-5">
|
||||
<a href="/"><img src="{{logo}}" style="height: 7.5rem" class="" alt="{{ main_name | default(value="") }}" /></a>
|
||||
<a href="/"><img src="{{logo}}" style="height: 7.5rem" class="" alt="TII Cryptographiuc Library" /></a>
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<label class="block text-slate-700 dark:text-slate-200 text-sm font-bold mb-2" for="username"> Username </label>
|
||||
@ -45,8 +48,8 @@
|
||||
<span class="text-lg m-auto pt-5"> Checking ... </span>
|
||||
</div>
|
||||
<div id="main-btns" class="flex items-center justify-between">
|
||||
<button id="signin-button" class="!bg-indigo-500 hover:bg-indigo-200 text-white py-2 px-4 rounded focus:outline-none focus:shadow-inline accent-indigo-600" onclick="log_in()">
|
||||
Login
|
||||
<button id="signin-button" class="!bg-indigo-500 !hover:bg-indigo-200 text-white hover:text-indigo-500 py-2 px-4 rounded focus:outline-none focus:shadow-inline accent-indigo-600" onclick="log_in()">
|
||||
{{login_text | default (value="Login")}}
|
||||
</button>
|
||||
{% if use_mail %}
|
||||
<a class="inline-block ml-3 align-baseline text-center text-xs text-blue-500 hover:text-blue-800" onclick="on_forgot_passwd()">
|
||||
@ -59,13 +62,21 @@
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if signin_target == "" %}
|
||||
{% include "partials/openid_login.html.j2" %}
|
||||
{% else %}
|
||||
<div class="flex items-center mt-2 space-x-2">
|
||||
<svg class="mr-3" width="30" height="30" aria-hidden="true"><use href="#symbl-openid"/></svg>
|
||||
<div class="text-xs"> Link credentials </div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</form>
|
||||
<div id="forgot-messages" class="hidden border-1 border-gray-500 bg-white dark:bg-gray-800 shadow-md rounded px-5 pt-4 pb-4 mb-11 text-orange-500 text-sm"></div>
|
||||
{% if with_totp %}
|
||||
<form id="otp-form" class="hidden bg-white dark:bg-gray-800 shadow-md rounded px-11 pt-6 pb-8 mb-4 -mt-8" onsubmit="return false;">
|
||||
<div
|
||||
class="flex items-center justify-center p-5">
|
||||
<a id="otp-logo-link" href="/"><img src="{{logo}}" style="height: 7.5rem" class="" alt="{{ main_name | default(value="") }}" /></a>
|
||||
<a id="otp-logo-link" href="/"><img src="{{logo}}" style="height: 7.5rem" class="" alt="TII Cryptographiuc Library" /></a>
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<label class="block text-slate-700 dark:text-slate-200 text-sm font-bold mb-2" for="username"> Enter TOTP code </label>
|
||||
@ -94,6 +105,7 @@
|
||||
</div>
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
<hr class="mb-4 mx-auto w-48 h-1 bg-gray-100 rounded border-0 md:mb-10 dark:bg-gray-700">
|
||||
<footer id="footer" class="bottom-0 text-center w-full py-4">
|
||||
<small class="text-gray-500">Copyright ©
|
||||
{{site_name | default(value='')}}
|
||||
{{req_settings.name | default(value='TII')}}
|
||||
2023. Made with ❤ by
|
||||
<a href="{{req_settings.url | default(value='#')}}" target="_blank" class="underline">{{main_name | default(value='')}}</a>
|
||||
<a href="{{req_settings.url | default(value='#')}}" target="_blank" class="underline">{{req_settings.author | default(value='TII CL')}}</a>
|
||||
•
|
||||
{# <a href="https://github.com/" class="underline" target="_blank" rel="noopener">View on Github</a> #}
|
||||
{# <a href="https://github.com/Crypto-TII" class="underline" target="_blank" rel="noopener">View on Github</a> #}
|
||||
</small>
|
||||
</footer>
|
||||
<script>
|
||||
@ -34,4 +34,4 @@
|
||||
</section>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
@ -59,7 +59,7 @@
|
||||
<div class="mt-2 mb-5 text-xs text-red-500" id="email-error"></div>
|
||||
{% if user and user.roles and user.roles != '' %}
|
||||
{% set roles = user.roles %}
|
||||
{% elif is_admin_user != 1 %}
|
||||
{% elif is_admin_user == 1 %}
|
||||
{% set roles = 'admin,dev' %}
|
||||
{% else %}
|
||||
{% set roles = 'default' %}
|
||||
@ -97,4 +97,31 @@
|
||||
<option value="light" {% if theme == 'light' %} selected {% endif %}>Light</option>
|
||||
<option value="dark" {% if theme == 'dark' %} selected {% endif %}>Dark</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
{% if openid_sel_appkeys %}
|
||||
{% set openids_keys = openid_sel_appkeys %}
|
||||
{% else %}
|
||||
{% set openids_keys = ''%}
|
||||
{% endif %}
|
||||
{% if no_edit or openids_keys == "" %}
|
||||
{% set css_openid = 'hidden'%}
|
||||
{% else %}
|
||||
{% set css_openid = ''%}
|
||||
{% endif %}
|
||||
<div class="mb-3 flex space-x-3 text-gray-500 dark:text-gray-400">
|
||||
<div class="mt-1 text-sm">OpenIDs:
|
||||
<svg class="ml-3 mr-3 svg" width="20" height="20" aria-hidden="true"><use href="#symbl-openid"/></svg>
|
||||
</div>
|
||||
<div id="openids-chips" class="flex {% if css_openid == '' %}mb-3{% endif %}"></div>
|
||||
</div>
|
||||
<div class="{{css_openid}} mb-2 relative z-0 flex">
|
||||
<input type="text" id="user-openids-inpt" onchange="set_openid(this)"
|
||||
class=" block py-2.5 px-0 w-full text-sm text-gray-900 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"
|
||||
value="{{openids_keys | default(value='')}}"
|
||||
data-val="{{openids_keys | default(value='')}}"
|
||||
placeholder=" " />
|
||||
<label for="user-openids-inpt" class="absolute text-sm text-gray-500 dark:text-gray-400 duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:left-0 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">
|
||||
Openid Auths</label>
|
||||
</div>
|
||||
<div class="{{css_openid}} mb-1 text-xs text-gray-500">Separated with commas.</div>
|
||||
<div class="{{css_openid}} mb-5 text-xs text-gray-500">ONLY <b>to delete existing</b> items.</div>
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
{% if other_css_link %}
|
||||
<link href="{{other_css_link}}" rel="stylesheet">
|
||||
{% endif %}
|
||||
<link rel="stylesheet" href="{{assets_url | default(value='')}}/css/images.css" />
|
||||
<link rel="stylesheet" href="{{assets_url | default(value='')}}/css/images_tiitls.css" />
|
||||
{#
|
||||
<link rel="stylesheet" href="{{assets_url | default(value='')}}/css/flowbite.min.css" />
|
||||
#}
|
||||
@ -26,4 +26,4 @@
|
||||
<div class="flex flex-col">
|
||||
{% if with_menu %}
|
||||
{% include "partials/navbar.html.j2" %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
@ -41,8 +41,21 @@
|
||||
<input type="text" id="usr-items" name="usr-items" class="shadow-sm bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-600 focus:border-blue-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="123456" required="">
|
||||
</div>
|
||||
<div class="col-span-6 sm:col-span-3">
|
||||
<label for="usr-openids" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">
|
||||
<div class="flex items-center space-x-3"">
|
||||
<span>Open IDs </span>
|
||||
<svg class="my-2" width="30" height="30" aria-hidden="true"><use href="#symbl-openid"/></svg>
|
||||
</div>
|
||||
</label>
|
||||
<input type="text" id="usr-openids" name="usr-openids" class="shadow-sm bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-600 focus:border-blue-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="OpenIDs keys" required="">
|
||||
</div>
|
||||
<div class="col-span-6 sm:col-span-3 mt-7">
|
||||
{# <label for="usr-status" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Status</label> #}
|
||||
<div class="flex space-x-4 ml-8">
|
||||
<div class="flex space-x-4 ml-2">
|
||||
<div class="flex items-center">
|
||||
<input type="checkbox" id="usr-isadmin" name="usr-isadmin" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
|
||||
<label for="usr-isadmin" class="block m-2 text-sm font-medium text-gray-900 dark:text-white">Admin </label>
|
||||
</div>
|
||||
<button id="states-button" data-dropdown-toggle="dropdown-status" class="flex-shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-500 bg-gray-100 border border-gray-300 rounded-l-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
|
||||
Status <svg aria-hidden="true" class="w-4 h-4 ml-1" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
|
||||
</button>
|
||||
@ -103,12 +116,6 @@
|
||||
</select> #}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-span-6 sm:col-span-3 mt-7">
|
||||
<div class="flex items-center">
|
||||
<input type="checkbox" id="usr-isadmin" name="usr-isadmin" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
|
||||
<label for="usr-isadmin" class="block m-2 text-sm font-medium text-gray-900 dark:text-white">Admin </label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-span-6 sm:col-span-3">
|
||||
<label for="usr-otp-defs" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">TOTP defs</label>
|
||||
<input type="text" id="usr-otp-defs" name="usr-otp-defs" class="shadow-sm bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-600 focus:border-blue-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="" required="">
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{% if usr_roles is containing('new') %}
|
||||
{% set logo= assets_url~"/images/logo_new.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo_new.svg" %}
|
||||
{% elif usr_roles is containing('dev') %}
|
||||
{% set logo= assets_url~"/images/logo_dev.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo_dev.svg" %}
|
||||
{% else %}
|
||||
{% set logo= assets_url~"/images/logo.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo.svg" %}
|
||||
{% endif %}
|
||||
<nav class="border-gray-200 bg-gray-50 dark:bg-gray-900 text-indigo-800 dark:text-indigo-200">
|
||||
<div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
|
||||
<a href="/" class="flex items-center">
|
||||
<img src="{{logo}}" style="height: 7.5rem" class="mr-3" alt="Doc Libraries" />
|
||||
<span class="self-center text-3xl font-semibold whitespace-nowrap dark:text-white">{{main_name | default(value='')}}</span>
|
||||
<img src="{{logo}}" style="height: 7.5rem" class="mr-3" alt="TII Cryptographiuc Library" />
|
||||
<span class="self-center text-3xl font-semibold whitespace-nowrap dark:text-white">TII CL</span>
|
||||
</a>
|
||||
{% if not color_theme %}
|
||||
{% set color_theme = "dark" %}
|
||||
|
||||
13
resources/templates/partials/openid_login.html.j2
Normal file
13
resources/templates/partials/openid_login.html.j2
Normal file
@ -0,0 +1,13 @@
|
||||
{% if openid_auths | length > 0 %}
|
||||
<div class="mt-5 ml-5 text-violet-500 text-lg flex items-center">
|
||||
<svg class="mr-3" width="30" height="30" aria-hidden="true"><use href="#symbl-openid"/></svg>
|
||||
<div class="ml-3"> OpenID Sign in with </div>
|
||||
</div>
|
||||
<div class="mt-2 flex items-center justify-between">
|
||||
{% for item in openid_auths %}
|
||||
<button id="otp-signin-button" class="capitalize !bg-violet-600 !hover:bg-violet-200 text-white !hover:text-violet-600 py-2 px-4 rounded focus:outline-none focus:shadow-inline accent-violet-500" onclick="on_openid('{{item}}')">
|
||||
{{ item }}
|
||||
</button>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
@ -85,4 +85,7 @@
|
||||
<svg><symbol id="symbl-trash" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
|
||||
</symbol></svg>
|
||||
<svg><symbol id="symbl-openid" xmlns="http://www.w3.org/2000/svg" fill="none" version="1.0" viewBox="0 0 2400 2400">
|
||||
<path fill="#ff7c00" d="m1270 218.3-173.1 84.3-.7 981.8c-.3 540 .2 981.4 1.1 981l174.5-81.8 172.3-80.8v-984.4c0-541.7-.2-984.7-.4-984.4z"></path><path fill="#aaa" d="M981.9 785.5c-425.3 63.2-766.5 264.1-889 523a491.5 491.5 0 0 0-43.6 146c-4.2 29.2-4.7 95-1.2 124 19 152.6 115.2 299.9 273.2 418.8 147.7 111 350.5 196.5 568.6 239.7 59 11.6 179 29 200.5 29 2.3 0 3-23.2 3-109.1v-109.2l-5.1-1-37.9-6a1182 1182 0 0 1-305.4-90.6c-122.2-55.7-225.1-137.7-284.6-226.4-107.5-160.5-81.3-344.3 70-491.3 57-55.5 115.4-95.2 199.5-136.1a1112.6 1112.6 0 0 1 269.4-89.2l29.7-6c3.7-1.2 4-8.6 4-111.5V779.5l-6.3.2a823 823 0 0 0-44.8 5.8zm525 104c0 103 .2 110.4 4.1 111.6l29.5 6a1221.6 1221.6 0 0 1 207.7 61.3A1087.8 1087.8 0 0 1 1862 1123c4.6 3.7 1.4 5.8-88 56-51.1 28.5-93 52.7-93 53.4 0 1.9 671.6 146.8 673.2 145.2 1.2-1.2-45.5-496-47-497.6-.2-.2-38.5 21-85 47.2l-89.6 50.2c-4.2 2-8.8.2-27.9-10.7-130.8-75-289.6-132.2-460.8-166.1a1870.8 1870.8 0 0 0-132.9-21.1c-4 0-4.2 6.7-4.2 110z"></path><path fill="#cbaa7c" d="M1094.5 2156.9c0 60.6.3 85.5.5 55 .5-30.2.5-79.9 0-110.3-.2-30.2-.5-5.3-.5 55.3z"></path>
|
||||
</symbol></svg>
|
||||
</div>
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
{% include "partials/header.html.j2" %}
|
||||
{% if usr_roles is containing('new') %}
|
||||
{% set logo= assets_url~"/images/logo_new.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo_new.svg" %}
|
||||
{% elif usr_roles is containing('dev') %}
|
||||
{% set logo= assets_url~"/images/logo_dev.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo_dev.svg" %}
|
||||
{% else %}
|
||||
{% set logo= assets_url~"/images/logo.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo.svg" %}
|
||||
{% endif %}
|
||||
<div class="blue-radial">
|
||||
{% if isadmin and isadmin == "TRUE" %}
|
||||
{% if isadmin == "TRUE" %}
|
||||
{% include "partials/navbar.html.j2" %}
|
||||
{% else %}
|
||||
{% include "partials/mini_navbar.html.j2" %}
|
||||
{% endif %}
|
||||
<section class="w-auto {% if isadmin and isadmin == "TRUE" %} mt-0 {% else %}mt-8{% endif %}">
|
||||
<section class="w-auto {% if isadmin == "TRUE" %} mt-0 {% else %}mt-8{% endif %}">
|
||||
<div
|
||||
class="flex items-center justify-center min-h-70%"
|
||||
>
|
||||
<form class="min-w-100 border-1 border-gray-500 bg-white dark:bg-gray-800 shadow-md rounded px-11 pt-6 pb-8 mb-4 -mt-8" onsubmit="return false;">
|
||||
<div
|
||||
class="flex items-center justify-center p-5">
|
||||
<a href="/"><img src="{{logo}}" style="height: 7.5rem" class="" alt="{{ main_name | default(value="") }}" /></a>
|
||||
<a href="/"><img src="{{logo}}" style="height: 7.5rem" class="" alt="TII Cryptographiuc Library" /></a>
|
||||
</div>
|
||||
<div class="flex justify-center mb-5 text-3xl text-indigo-800 dark:text-indigo-200">Signup</div>
|
||||
{% include "partials/form-user.html.j2" %}
|
||||
@ -54,7 +54,7 @@
|
||||
const totp_digits = {{totp_digits | default(value=0)}};
|
||||
const totp_algorithm = '{{totp_algorithm | default(value='')}}';
|
||||
const totp_mode = '{{totp_mode | default(value='')}}';
|
||||
{% if user and user.isadmin and user.isadmin == 1 or isadmin and isadmin == 'TRUE' %}
|
||||
{% if user and user.isadmin and user.isadmin is containing('TRUE') or isadmin and isadmin is containing('TRUE') %}
|
||||
const id_user = 'A';
|
||||
{% else %}
|
||||
const id_user = '';
|
||||
@ -63,4 +63,4 @@
|
||||
{# <script src="{{assets_url | default(value='')}}/js/signup.js"></script> #}
|
||||
<script src="{{assets_url | default(value='')}}/js/user_settings.js"></script>
|
||||
{% include "partials/symbols.html.j2" %}
|
||||
{% include "partials/footer.html.j2" %}
|
||||
{% include "partials/footer.html.j2" %}
|
||||
@ -1,10 +1,10 @@
|
||||
{% include "partials/header.html.j2" %}
|
||||
{% if usr_roles is containing('new') %}
|
||||
{% set logo= assets_url~"/images/logo_new.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo_new.svg" %}
|
||||
{% elif usr_roles is containing('dev') %}
|
||||
{% set logo= assets_url~"/images/logo_dev.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo_dev.svg" %}
|
||||
{% else %}
|
||||
{% set logo= assets_url~"/images/logo.svg" %}
|
||||
{% set logo= assets_url~"/images/tii_cl_logo.svg" %}
|
||||
{% endif %}
|
||||
<div class="{% if edit_reset and edit_reset == "password" %}mt-11{% endif %}">
|
||||
<section class="w-auto mt-8">
|
||||
@ -17,7 +17,7 @@
|
||||
>
|
||||
<div
|
||||
class="hidden flex items-center justify-center p-5">
|
||||
<a href="/"><img src="{{logo}}" style="height: 7.5rem" class="" alt="{{main_name | default(value="")}}" /></a>
|
||||
<a href="/"><img src="{{logo}}" style="height: 7.5rem" class="" alt="TII Cryptographiuc Library" /></a>
|
||||
</div>
|
||||
<div id="section-title" class="mb-8 flex justify-center"mb-5 text-3xl text-indigo-800 dark:text-indigo-200">
|
||||
<svg class="pl-3 w-8 h-8"><use href="#symbl-cog" /></svg>
|
||||
@ -130,4 +130,4 @@ const totp_in = () => {
|
||||
<script src="{{assets_url | default(value='')}}/js/user_settings.js"></script>
|
||||
{% endif %}
|
||||
{% include "partials/symbols.html.j2" %}
|
||||
{% include "partials/footer.html.j2" %}
|
||||
{% include "partials/footer.html.j2" %}
|
||||
@ -129,11 +129,16 @@
|
||||
<svg class="pl-2 w-4 h-4"><use href="#symbl-table-col-sort" /></svg>
|
||||
</div>
|
||||
</th>
|
||||
<th data-th="status" scope="col" class="px-6 py-3">
|
||||
<th data-th="status" scope="col" class="px-6 py-3">
|
||||
<div class="flex items-center">
|
||||
Is Admin
|
||||
</div>
|
||||
</th>
|
||||
<th data-th="status" scope="col" class="px-6 py-3">
|
||||
<div class="flex items-center">
|
||||
Open IDs
|
||||
</div>
|
||||
</th>
|
||||
<th data-th="totp" scope="col" class="px-6 py-3">
|
||||
<div class="flex items-center">
|
||||
TOTP
|
||||
@ -147,7 +152,8 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for user in usrs %}
|
||||
{% if users %}
|
||||
{% for user in users %}
|
||||
{% if loop.index % 2 == 0%}
|
||||
{% set tr_css="bg-gray-100 dark:bg-gray-800" %}
|
||||
{% else %}
|
||||
@ -236,6 +242,13 @@
|
||||
{% if user.isadmin == true %} admin {% endif %}
|
||||
</div>
|
||||
</td>
|
||||
<td class="px-6">
|
||||
<div class="flex items-center">
|
||||
{% if users_openids and users_openids[loop.index0] %}
|
||||
{{ users_openids[loop.index0] | default(value='') }}
|
||||
{% endif %}
|
||||
</div>
|
||||
</td>
|
||||
<td class="px-6">
|
||||
<div class="flex flex-col mt-2">
|
||||
<div class="mt-2 mb-2 flex space-x-2">
|
||||
@ -268,6 +281,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</tbody>
|
||||
</table>
|
||||
<!-- Edit user modal -->
|
||||
@ -275,7 +289,7 @@
|
||||
</div>
|
||||
</section>
|
||||
<script id="js-data">
|
||||
let users_list = JSON.stringify({{usrs | map(attribute="id")| json_encode() | safe }});
|
||||
let users_list = {% if users %} JSON.stringify({{users | map(attribute="id")| json_encode() | safe }}); {% else %} ''; {% endif %}
|
||||
</script>
|
||||
<script>
|
||||
const GETUSER_URL = "{{main_url}}/userget";
|
||||
|
||||
0
src/handlers/login_user.rs
Normal file
0
src/handlers/login_user.rs
Normal file
631
src/users/openid.rs
Normal file
631
src/users/openid.rs
Normal file
@ -0,0 +1,631 @@
|
||||
use serde::{Deserialize,Serialize};
|
||||
use sqlx::Row;
|
||||
use futures::TryStreamExt;
|
||||
use anyhow::{anyhow,Context, Result};
|
||||
use std::{
|
||||
fmt,
|
||||
collections::HashMap,
|
||||
};
|
||||
// use std::{
|
||||
// // sync::Arc,
|
||||
// fmt::Debug,
|
||||
// // io::Write,
|
||||
// // fs,
|
||||
// // path::{Path, PathBuf},
|
||||
// // io::{Error, ErrorKind},
|
||||
// collections::HashMap,
|
||||
// };
|
||||
// use async_session::{MemoryStore, Session, SessionStore};
|
||||
//use tiitls_utils::logs::file;
|
||||
// use uuid::Uuid;
|
||||
// SID_UI_FILE,
|
||||
// UI_SETTINGS_FILE,
|
||||
// SidSettings,
|
||||
// Config as SessionsConfig,
|
||||
use std::num::ParseIntError;
|
||||
use crate::{
|
||||
users::{
|
||||
entries::{Entries,Entry},
|
||||
UserData,
|
||||
UserStore,
|
||||
UserStatus,
|
||||
},
|
||||
USERS_TABLENAME,
|
||||
tools::str_date_from_timestamp,
|
||||
};
|
||||
|
||||
const DISPLAY_SEPARATOR: &str = "=";
|
||||
|
||||
fn default_user_status() -> UserStatus {
|
||||
UserStatus::default()
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, PartialOrd, Serialize, Deserialize,Default)]
|
||||
pub struct User {
|
||||
pub id: i64,
|
||||
pub name: String,
|
||||
pub fullname: String,
|
||||
pub email: String,
|
||||
pub description: String,
|
||||
pub password: String,
|
||||
pub otp_enabled: bool,
|
||||
pub otp_verified: bool,
|
||||
pub otp_base32: String,
|
||||
pub otp_auth_url: String,
|
||||
pub otp_defs: String,
|
||||
pub roles: String,
|
||||
pub created: String,
|
||||
pub lastaccess: String,
|
||||
#[serde(default = "default_user_status")]
|
||||
pub status: UserStatus,
|
||||
pub items: String,
|
||||
pub isadmin: bool,
|
||||
}
|
||||
|
||||
impl fmt::Display for User {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
// Write strictly the first element into the supplied output
|
||||
// stream: `f`. Returns `fmt::Result` which indicates whether the
|
||||
// operation succeeded or failed. Note that `write!` uses syntax which
|
||||
// is very similar to `println!`.
|
||||
let sep = DISPLAY_SEPARATOR;
|
||||
let content = format!(
|
||||
"ID{} {}
|
||||
Name{} {}
|
||||
FullName{} {}
|
||||
Description{} {}
|
||||
Email{} {}
|
||||
Password{} {}
|
||||
otp_enabled{} {}
|
||||
otp_verified{} {}
|
||||
otp_base32{} {}
|
||||
otp_auth_url{} {}
|
||||
otp_defs{} {}
|
||||
Roles{} {}
|
||||
Created{} {}
|
||||
Last access{} {}
|
||||
Status{} {}
|
||||
Items{} {}
|
||||
IsAdmin{} {}",
|
||||
sep, self.id,
|
||||
sep, self.name, sep, self.fullname,
|
||||
sep, self.description,
|
||||
sep, self.email,
|
||||
sep, self.password,
|
||||
sep, self.otp_enabled,
|
||||
sep, self.otp_verified,
|
||||
sep, self.otp_base32,
|
||||
sep, self.otp_auth_url,
|
||||
sep, self.otp_defs,
|
||||
sep, self.roles,
|
||||
sep, self.created, sep, self.lastaccess,
|
||||
sep, self.status,
|
||||
sep, self.items,
|
||||
sep, self.isadmin
|
||||
);
|
||||
write!(f, "{}", content)
|
||||
}
|
||||
}
|
||||
|
||||
impl Entry for User {
|
||||
fn from_line(line: &str) -> Result<User, ParseIntError> {
|
||||
let parts: Vec<&str> = line.split(":").map(|part| part.trim()).collect();
|
||||
Ok(User {
|
||||
id: parts[0].to_string().parse::<i64>().unwrap_or_default(),
|
||||
name: parts[1].to_string(),
|
||||
fullname: parts[2].to_string(),
|
||||
description: parts[3].to_string(),
|
||||
email: parts[4].to_string(),
|
||||
password: parts[5].to_string(),
|
||||
otp_enabled: if parts[6] == "TRUE" { true } else { false},
|
||||
otp_verified: if parts[7] == "TRUE" { true } else { false},
|
||||
otp_base32: parts[8].to_string(),
|
||||
otp_auth_url: parts[9].to_string(),
|
||||
otp_defs: parts[10].to_string(),
|
||||
roles: parts[11].to_string(),
|
||||
created: parts[12].to_string(),
|
||||
lastaccess: parts[13].to_string(),
|
||||
status: UserStatus::from_str(&parts[14].to_string()),
|
||||
items: parts[15].to_string(),
|
||||
isadmin: if parts[16] == "TRUE" { true } else { false},
|
||||
})
|
||||
}
|
||||
}
|
||||
impl User {
|
||||
pub async fn add(self, store: &UserStore) -> Result<i64> {
|
||||
|
||||
match store {
|
||||
UserStore::Sql(pool) => {
|
||||
let query_result = sqlx::query(
|
||||
format!("INSERT INTO {} (
|
||||
name, fullname, email, description, password, otp_enabled, otp_verified,
|
||||
otp_base32,
|
||||
otp_auth_url,
|
||||
otp_defs,
|
||||
roles, created, lastaccess, status, items, isadmin
|
||||
) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", USERS_TABLENAME).as_str()
|
||||
)
|
||||
.bind(self.name)
|
||||
.bind(self.fullname)
|
||||
.bind(self.email)
|
||||
.bind(self.description)
|
||||
.bind(self.password)
|
||||
.bind(self.otp_enabled)
|
||||
.bind(self.otp_verified)
|
||||
.bind(self.otp_base32)
|
||||
.bind(self.otp_auth_url)
|
||||
.bind(self.otp_defs)
|
||||
.bind(self.roles)
|
||||
.bind(self.created)
|
||||
.bind(self.lastaccess)
|
||||
.bind(format!("{}",self.status))
|
||||
.bind(self.items)
|
||||
.bind(self.isadmin)
|
||||
.execute(pool).await?;
|
||||
Ok(query_result.last_insert_id().unwrap_or_default())
|
||||
},
|
||||
UserStore::File(file_path) => {
|
||||
// use itertools::Itertools;
|
||||
// let entries: Vec<String> = concat(vec![
|
||||
// Entries::new(Path::new(&file_path)).map(|user: User|{
|
||||
// user.line_format()
|
||||
// }).collect(),
|
||||
// vec![ self.line_format()]
|
||||
// ]);
|
||||
// Entries::<User>::write(Path::new(&file_path), &entries);
|
||||
let all: Vec<User> = Entries::new(&file_path).collect();
|
||||
let id = if all.len() > 0 {
|
||||
all[all.len()-1].id + 1
|
||||
} else {
|
||||
1
|
||||
};
|
||||
let mut new_user = self.to_owned();
|
||||
new_user.id = id;
|
||||
let entries: Entries<User> = Entries::new(&file_path);
|
||||
match entries.append(new_user.line_format()) {
|
||||
Ok(_) => Ok(id),
|
||||
Err(e) => {
|
||||
println!("Error add item to file: {}",e);
|
||||
Err(anyhow!("No data added")).context("User add")
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
pub async fn select(field: &str, value: &str, human: bool, store: &UserStore) -> Result<Self> {
|
||||
match store {
|
||||
UserStore::Sql(pool) => {
|
||||
let query_str = format!("SELECT * FROM {} WHERE {} = ? ", USERS_TABLENAME, field);
|
||||
let mut stream = sqlx::query(
|
||||
&query_str
|
||||
)
|
||||
.bind(value)
|
||||
//.map(|row: PgRow| {
|
||||
// map the row into a user-defined domain type
|
||||
//})
|
||||
.fetch(pool);
|
||||
if let Some(row) = stream.try_next().await? {
|
||||
let str_status: String = row.try_get("status")?;
|
||||
let status = UserStatus::from_str(&str_status);
|
||||
let created = if human {
|
||||
let created: String = row.try_get("created")?;
|
||||
str_date_from_timestamp(&created)
|
||||
} else {
|
||||
row.try_get("created")?
|
||||
};
|
||||
let lastaccess = if human {
|
||||
let lastaccess: String = row.try_get("lastaccess")?;
|
||||
str_date_from_timestamp(&lastaccess)
|
||||
} else {
|
||||
row.try_get("lastaccess")?
|
||||
};
|
||||
Ok(Self{
|
||||
id: row.try_get("id")?,
|
||||
name: row.try_get("name")?,
|
||||
fullname: row.try_get("fullname")?,
|
||||
email: row.try_get("email")?,
|
||||
description: row.try_get("description")?,
|
||||
password: row.try_get("password")?,
|
||||
otp_enabled: row.try_get("otp_enabled")?,
|
||||
otp_verified: row.try_get("otp_verified")?,
|
||||
otp_base32: row.try_get("otp_base32")?,
|
||||
otp_auth_url: row.try_get("otp_auth_url")?,
|
||||
otp_defs: row.try_get("otp_defs")?,
|
||||
roles: row.try_get("roles")?,
|
||||
created,
|
||||
lastaccess,
|
||||
status,
|
||||
items: row.try_get("items")?,
|
||||
isadmin: row.try_get("isadmin")?,
|
||||
})
|
||||
} else {
|
||||
Err(anyhow!("No data found")).context("User select")
|
||||
}
|
||||
},
|
||||
UserStore::File(file_path) => {
|
||||
if let Some(user) =
|
||||
Entries::<User>::new(&file_path).find(|it|
|
||||
match field {
|
||||
"id" => it.id == value.parse::<i64>().unwrap_or_default(),
|
||||
"name" => it.name == value,
|
||||
"fullname" => it.fullname == value,
|
||||
"email" => it.email == value,
|
||||
"description" => it.description == value,
|
||||
"otp_base32" => it.otp_base32 == value,
|
||||
"roles" => it.roles == value,
|
||||
"items" => it.items == value,
|
||||
"isadmin" => match value {
|
||||
"TRUE" => it.isadmin,
|
||||
_ => !it.isadmin,
|
||||
},
|
||||
_ => false,
|
||||
}
|
||||
)
|
||||
{
|
||||
Ok(user)
|
||||
} else {
|
||||
Err(anyhow!("No data found")).context("User select")
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn delete(id: i64, store: &UserStore) -> Result<bool> {
|
||||
match store {
|
||||
UserStore::Sql(pool) => {
|
||||
let query_str = format!("DELETE FROM {} WHERE id = ?", USERS_TABLENAME);
|
||||
let query_result = sqlx::query(
|
||||
&query_str
|
||||
)
|
||||
.bind(id)
|
||||
.execute(pool).await?;
|
||||
Ok(query_result.rows_affected() > 0)
|
||||
},
|
||||
UserStore::File(file_path) => {
|
||||
let new_entries: Vec<String> =
|
||||
Entries::<User>::new(&file_path).filter(|it| it.id != id).map(|user|
|
||||
user.line_format()
|
||||
).collect();
|
||||
let entries = Entries::<User>::new(&file_path);
|
||||
match entries.write(&new_entries) {
|
||||
Ok(_) => Ok(true),
|
||||
Err(e) => {
|
||||
println!("Error data delete '{}': {}", id, e);
|
||||
Err(anyhow!("No data delete").context("User delete"))
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
pub async fn update(self, store: &UserStore) -> anyhow::Result<bool> {
|
||||
match store {
|
||||
UserStore::Sql(pool) => {
|
||||
let query_str = format!("UPDATE {} SET name = ?, fullname = ?,
|
||||
email = ?, description = ?, password = ?,
|
||||
otp_enabled = ?, otp_verified = ?,
|
||||
otp_base32 = ?, otp_auth_url = ?,
|
||||
otp_defs = ?,
|
||||
roles = ?,
|
||||
created = ?, lastaccess = ?,
|
||||
status = ?,
|
||||
items = ?,
|
||||
isadmin = ?
|
||||
WHERE id = ? ",
|
||||
USERS_TABLENAME
|
||||
);
|
||||
let query_result = sqlx::query(
|
||||
&query_str
|
||||
)
|
||||
.bind(self.name)
|
||||
.bind(self.fullname)
|
||||
.bind(self.email)
|
||||
.bind(self.description)
|
||||
.bind(self.password)
|
||||
.bind(self.otp_enabled)
|
||||
.bind(self.otp_verified)
|
||||
.bind(self.otp_base32)
|
||||
.bind(self.otp_auth_url)
|
||||
.bind(self.otp_defs)
|
||||
.bind(self.roles)
|
||||
.bind(self.created)
|
||||
.bind(self.lastaccess)
|
||||
.bind(format!("{}",self.status))
|
||||
.bind(self.items)
|
||||
.bind(self.isadmin)
|
||||
.bind(self.id)
|
||||
.execute(pool).await?;
|
||||
Ok(query_result.rows_affected() > 0)
|
||||
},
|
||||
UserStore::File(file_path) => {
|
||||
let new_entries: Vec<String> = Entries::new(&file_path).map(|user: User|{
|
||||
if user.id == self.id {
|
||||
self.to_owned().line_format()
|
||||
} else {
|
||||
user.line_format()
|
||||
}
|
||||
}).collect();
|
||||
let entries = Entries::<User>::new(&file_path);
|
||||
match entries.write(&new_entries) {
|
||||
Ok(_) => Ok(true),
|
||||
Err(e) => {
|
||||
println!("Error data update '{}': {}", self.id, e);
|
||||
Err(anyhow!("No data updated").context("User update"))
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
pub fn show(&self, sep: &str) {
|
||||
let content = if sep.is_empty() {
|
||||
format!( "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}",
|
||||
self.id,
|
||||
self.name, self.fullname,
|
||||
self.description,
|
||||
self.email,
|
||||
self.password,
|
||||
self.otp_enabled,
|
||||
self.otp_verified,
|
||||
self.otp_base32,
|
||||
self.otp_auth_url,
|
||||
self.otp_defs,
|
||||
self.roles,
|
||||
self.created,
|
||||
self.lastaccess,
|
||||
self.status,
|
||||
self.items,
|
||||
self.isadmin
|
||||
)
|
||||
} else {
|
||||
format!("{}",&self).replace(DISPLAY_SEPARATOR, sep)
|
||||
};
|
||||
println!("{}\n_____________________________",content);
|
||||
}
|
||||
pub async fn list(store: &UserStore, human: bool, show: bool, sep: &str) -> anyhow::Result<Vec<User>> {
|
||||
let mut usrs: Vec<User> = Vec::new();
|
||||
match store {
|
||||
UserStore::Sql(pool) => {
|
||||
let query_str = format!("SELECT * FROM {}", USERS_TABLENAME);
|
||||
let mut stream = sqlx::query(
|
||||
&query_str
|
||||
)
|
||||
//.map(|row: PgRow| {
|
||||
// map the row into a user-defined domain type
|
||||
//})
|
||||
.fetch(pool);
|
||||
while let Some(row) = stream.try_next().await? {
|
||||
let str_status: String = row.try_get("status")?;
|
||||
let status = UserStatus::from_str(&str_status);
|
||||
let created = if human {
|
||||
let created: String = row.try_get("created")?;
|
||||
str_date_from_timestamp(&created)
|
||||
} else {
|
||||
row.try_get("created")?
|
||||
};
|
||||
let lastaccess = if human {
|
||||
let lastaccess: String = row.try_get("lastaccess")?;
|
||||
str_date_from_timestamp(&lastaccess)
|
||||
} else {
|
||||
row.try_get("lastaccess")?
|
||||
};
|
||||
let user = Self{
|
||||
id: row.try_get("id")?,
|
||||
name: row.try_get("name")?,
|
||||
fullname: row.try_get("fullname")?,
|
||||
email: row.try_get("email")?,
|
||||
description: row.try_get("description")?,
|
||||
password: row.try_get("password")?,
|
||||
otp_enabled: row.try_get("otp_enabled")?,
|
||||
otp_verified: row.try_get("otp_verified")?,
|
||||
otp_base32: row.try_get("otp_base32")?,
|
||||
otp_auth_url: row.try_get("otp_auth_url")?,
|
||||
otp_defs: row.try_get("otp_defs")?,
|
||||
roles: row.try_get("roles")?,
|
||||
created,
|
||||
lastaccess,
|
||||
status,
|
||||
items: row.try_get("items")?,
|
||||
isadmin: row.try_get("isadmin")?,
|
||||
};
|
||||
if show { user.show(sep); }
|
||||
usrs.push(user);
|
||||
}
|
||||
Ok(usrs)
|
||||
},
|
||||
UserStore::File(file_path) => {
|
||||
let all: Vec<User> = Entries::new(&file_path).collect();
|
||||
if show {
|
||||
for user in all.to_owned() { if show { user.show(sep); } }
|
||||
}
|
||||
Ok(all)
|
||||
},
|
||||
// UserStore::None => Err(anyhow!("No store set")).context("Users list"),
|
||||
}
|
||||
}
|
||||
pub async fn count(store: &UserStore) -> anyhow::Result<i64> {
|
||||
match store {
|
||||
UserStore::Sql(pool) => {
|
||||
|
||||
let query_str = format!("SELECT count(*) as total FROM {}", USERS_TABLENAME);
|
||||
let row = sqlx::query(
|
||||
&query_str
|
||||
)
|
||||
.fetch_one(pool).await?;
|
||||
|
||||
let total: i64 = row.try_get("total")?;
|
||||
Ok(total)
|
||||
},
|
||||
UserStore::File(file_path) => {
|
||||
let all: Vec<User> = Entries::new(&file_path).collect();
|
||||
Ok(all.len() as i64)
|
||||
},
|
||||
}
|
||||
}
|
||||
fn line_format(self) -> String {
|
||||
format!( "{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}",
|
||||
self.id,
|
||||
self.name, self.fullname,
|
||||
self.description,
|
||||
self.email,
|
||||
self.password,
|
||||
self.otp_enabled,
|
||||
self.otp_verified,
|
||||
self.otp_base32,
|
||||
self.otp_auth_url,
|
||||
self.otp_defs,
|
||||
self.roles,
|
||||
self.created, self.lastaccess,
|
||||
self.status,
|
||||
self.items,
|
||||
self.isadmin
|
||||
)
|
||||
}
|
||||
pub fn hash_items(items: &str) -> HashMap<String,String> {
|
||||
if items.is_empty() {
|
||||
HashMap::new()
|
||||
} else {
|
||||
serde_json::from_str(items).unwrap_or_else(|e|{
|
||||
println!("Error to convert user items to json: {}",e);
|
||||
HashMap::new()
|
||||
})
|
||||
}
|
||||
}
|
||||
pub fn items(&self) -> HashMap<String,String> {
|
||||
Self::hash_items(&self.items)
|
||||
}
|
||||
pub fn json_items(items: HashMap<String,String>) -> String {
|
||||
serde_json::to_string(&items).unwrap_or_else(|e|{
|
||||
println!("Error to convert user items to string: {}",e);
|
||||
String::from("")
|
||||
})
|
||||
}
|
||||
pub fn from_data(&mut self, user_data: UserData) {
|
||||
if !user_data.name.is_empty() {
|
||||
self.name = user_data.name.to_owned();
|
||||
}
|
||||
if !user_data.fullname.is_empty() {
|
||||
self.fullname = user_data.fullname.to_owned();
|
||||
}
|
||||
if !user_data.description.is_empty() {
|
||||
self.description = user_data.description.to_owned();
|
||||
}
|
||||
if !user_data.email.is_empty() {
|
||||
self.email = user_data.email.to_owned();
|
||||
}
|
||||
if !user_data.otp_code.is_empty() {
|
||||
self.otp_base32 = user_data.otp_code.to_owned();
|
||||
}
|
||||
if !user_data.otp_url.is_empty() {
|
||||
self.otp_auth_url = user_data.otp_url.to_owned();
|
||||
}
|
||||
if !user_data.roles.is_empty() {
|
||||
self.roles = user_data.roles.to_owned();
|
||||
}
|
||||
if !user_data.items.is_empty() {
|
||||
let mut items_hash = self.items();
|
||||
for (key,val) in user_data.items {
|
||||
items_hash.insert(key,val);
|
||||
}
|
||||
self.items = Self::json_items(items_hash);
|
||||
}
|
||||
}
|
||||
pub fn disable_totp(&mut self) {
|
||||
self.otp_base32 = String::from("");
|
||||
self.otp_auth_url = String::from("");
|
||||
self.otp_defs = String::from("");
|
||||
self.otp_verified = false;
|
||||
self.otp_enabled = false;
|
||||
}
|
||||
pub fn from_user(&mut self, new_user: User) {
|
||||
if !new_user.name.is_empty() {
|
||||
self.name = new_user.name.to_owned();
|
||||
}
|
||||
if !new_user.fullname.is_empty() {
|
||||
self.fullname = new_user.fullname.to_owned();
|
||||
}
|
||||
if !new_user.description.is_empty() {
|
||||
self.description = new_user.description.to_owned();
|
||||
}
|
||||
if !new_user.email.is_empty() {
|
||||
self.email = new_user.email.to_owned();
|
||||
}
|
||||
if !new_user.password.is_empty() {
|
||||
self.password = new_user.password.to_owned();
|
||||
}
|
||||
if new_user.otp_enabled {
|
||||
self.disable_totp();
|
||||
} else {
|
||||
if !new_user.otp_base32.is_empty() {
|
||||
self.otp_base32 = new_user.otp_base32.to_owned();
|
||||
}
|
||||
if !new_user.otp_auth_url.is_empty() {
|
||||
self.otp_auth_url = new_user.otp_auth_url.to_owned();
|
||||
}
|
||||
if !new_user.otp_defs.is_empty() {
|
||||
self.otp_defs = new_user.otp_defs.to_owned();
|
||||
}
|
||||
self.otp_verified = new_user.otp_verified;
|
||||
}
|
||||
if !new_user.roles.is_empty() {
|
||||
self.roles = new_user.roles.to_owned();
|
||||
}
|
||||
if !new_user.items.is_empty() {
|
||||
self.items = new_user.items.to_owned();
|
||||
}
|
||||
if new_user.status != self.status {
|
||||
self.status = new_user.status.to_owned();
|
||||
}
|
||||
}
|
||||
pub fn session_data(&self) -> String {
|
||||
format!("{}|{}|{}|{}|{}|{}|{}",
|
||||
&self.id,
|
||||
&self.name,
|
||||
&self.email,
|
||||
&self.roles,
|
||||
&self.items,
|
||||
&self.isadmin,
|
||||
&self.status
|
||||
)
|
||||
}
|
||||
pub fn estimate_password(word: &str) -> String {
|
||||
match zxcvbn::zxcvbn(word, &[]) {
|
||||
Ok(estimate) => {
|
||||
if let Some(feedback) = estimate.feedback() {
|
||||
let arr_suggestions: Vec<String> = feedback.suggestions().iter().map(|s| format!("{}",s)).collect();
|
||||
let suggestions = arr_suggestions.join("\n");
|
||||
if let Some(warning) = feedback.warning() {
|
||||
let warning = format!("{}", warning);
|
||||
format!("{}|{}|{}",estimate.score(),suggestions,warning)
|
||||
} else {
|
||||
format!("{}|{}|",estimate.score(),suggestions)
|
||||
}
|
||||
} else {
|
||||
format!("{}||",estimate.score())
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
println!("Error password strength estimator: {}", e);
|
||||
String::from("-1|||")
|
||||
}
|
||||
}
|
||||
}
|
||||
pub fn password_score(word: &str) -> u8 {
|
||||
match zxcvbn::zxcvbn(word, &[]) {
|
||||
Ok(estimate) => {
|
||||
estimate.score()
|
||||
},
|
||||
Err(e) => {
|
||||
println!("Error password strength estimator: {}", e);
|
||||
0
|
||||
}
|
||||
}
|
||||
}
|
||||
#[allow(dead_code)]
|
||||
pub fn has_auth_role(&self, auth_roles: Vec<String>) -> bool {
|
||||
for role in auth_roles {
|
||||
if self.roles.contains(&role) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user