Skip to content
Commits on Source (7)
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 8f1b2330
...@@ -4,3 +4,4 @@ key.pem ...@@ -4,3 +4,4 @@ key.pem
void.py void.py
*.pyc *.pyc
*.ignore *.ignore
venv/*
utils/template.py
View file @ 8f1b2330
...@@ -20,7 +20,6 @@ def my_render_template( *args, **kwargs ): ...@@ -20,7 +20,6 @@ def my_render_template( *args, **kwargs ):
kwargs[ "js" ] = config.cdnjs kwargs[ "js" ] = config.cdnjs
kwargs[ "css" ] = config.cdncss kwargs[ "css" ] = config.cdncss
kwargs[ "session_timeout" ] = config.session_timeout kwargs[ "session_timeout" ] = config.session_timeout
kwargs[ "session_security_key" ] = session.get( "session_security_key" )
kwargs[ "account_type" ] = session.get( "account_type", None ) kwargs[ "account_type" ] = session.get( "account_type", None )
kwargs[ "account_type_name" ] = session.get( "account_type_name", None ) kwargs[ "account_type_name" ] = session.get( "account_type_name", None )
kwargs[ "admin" ] = session.get( "account_type_name", None ) == "Administrator" kwargs[ "admin" ] = session.get( "account_type_name", None ) == "Administrator"
......
views/afis/templates/afis/shared/segment.html
View file @ 8f1b2330
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
padding-left: 10px; padding-left: 10px;
padding-right: 20px; padding-right: 20px;
width: fit-content; width: fit-content;
width: -moz-fit-content;
background-color: rgb( 238, 238, 238 ); background-color: rgb( 238, 238, 238 );
} }
</style> </style>
......
views/login/__init__.py
View file @ 8f1b2330
...@@ -65,7 +65,6 @@ def session_clear_and_prepare(): ...@@ -65,7 +65,6 @@ def session_clear_and_prepare():
session[ "process" ] = "login" session[ "process" ] = "login"
session[ "need_to_check" ] = [ "password" ] session[ "need_to_check" ] = [ "password" ]
session[ "logged" ] = False session[ "logged" ] = False
session[ "session_security_key" ] = str( uuid4() )
@login_view.route( "/login" ) @login_view.route( "/login" )
def login(): def login():
......
views/login/templates/login.html
View file @ 8f1b2330
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
homeurl = "{{ url_for( 'base.home' ) }}"; homeurl = "{{ url_for( 'base.home' ) }}";
begin_activate_url = "{{ url_for( 'login.webauthn_begin_activate' ) }}"; begin_activate_url = "{{ url_for( 'login.webauthn_begin_activate' ) }}";
verify_url = "{{ url_for( 'login.webauthn_verify' ) }}"; verify_url = "{{ url_for( 'login.webauthn_verify' ) }}";
begin_assertion_url = "{{ url_for( 'login.webauthn_begin_assertion' ) }}"; begin_assertion_url = "{{ url_for( 'login.webauthn_begin_assertion' ) }}";
verify_assertion_url = "{{ url_for( 'login.webauthn_verify_assertion' ) }}"; verify_assertion_url = "{{ url_for( 'login.webauthn_verify_assertion' ) }}";
localStorage.setItem( "session_key", "" );
</script> </script>
</head> </head>
<body> <body>
...@@ -98,9 +99,7 @@ ...@@ -98,9 +99,7 @@
password_local = await generateKey( password_local, "icnml_" + username + "_localpassword", 50000 ); password_local = await generateKey( password_local, "icnml_" + username + "_localpassword", 50000 );
password_local = password_local.substring( 0, 128 ); password_local = password_local.substring( 0, 128 );
localStorage.setItem( "session_key", password_local );
var e = encrypt( password_local, "{{ session_security_key }}" );
sessionStorage.setItem( "session_key", e );
$.ajax( { $.ajax( {
url: "{{ url_for( 'login.do_login' ) }}", url: "{{ url_for( 'login.do_login' ) }}",
......
views/submission/templates/admin/segment_list.html
View file @ 8f1b2330
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<script type="text/javascript"> <script type="text/javascript">
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var filename = decrypt( "{{ filename }}", password_local ); var filename = decrypt( "{{ filename }}", password_local );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
</script> </script>
......
views/submission/templates/shared/mark.html
View file @ 8f1b2330
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<script type="text/javascript"> <script type="text/javascript">
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
var filename = decrypt( "{{ file[ 'filename' ] }}", password_local ); var filename = decrypt( "{{ file[ 'filename' ] }}", password_local );
......
views/submission/templates/shared/mark_list.html
View file @ 8f1b2330
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
{% if not admin %} {% if not admin %}
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
{% endif %} {% endif %}
......
views/submission/templates/shared/tenprint.html
View file @ 8f1b2330
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
file_id = "{{ file[ 'uuid' ] }}"; file_id = "{{ file[ 'uuid' ] }}";
{% if not admin %} {% if not admin %}
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
var filename = decrypt( "{{ file[ 'filename' ] }}", password_local ); var filename = decrypt( "{{ file[ 'filename' ] }}", password_local );
{% endif %} {% endif %}
......
views/submission/templates/submission/add_files.html
View file @ 8f1b2330
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
submission_id = "{{ submission_id }}"; submission_id = "{{ submission_id }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
var update_nickname = function() var update_nickname = function()
......
views/submission/templates/submission/add_marks_by_finger.html
View file @ 8f1b2330
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
submission_id = "{{ submission_id }}"; submission_id = "{{ submission_id }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ user.nickname }}", password_local ); var nickname = decrypt( "{{ user.nickname }}", password_local );
var update_nickname = function() var update_nickname = function()
......
views/submission/templates/submission/consent_form.html
View file @ 8f1b2330
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
submission_id = "{{ submission_id }}"; submission_id = "{{ submission_id }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
var update_nickname = function() var update_nickname = function()
......
views/submission/templates/submission/list.html
View file @ 8f1b2330
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var donors = {}; var donors = {};
{% for donor in donors %} {% for donor in donors %}
......
views/submission/templates/submission/mark_pfsp.html
View file @ 8f1b2330
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
current_pfsp = "{{ current_pfsp }}"; current_pfsp = "{{ current_pfsp }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
var filename = decrypt( "{{ file[ 'filename' ] }}", password_local ); var filename = decrypt( "{{ file[ 'filename' ] }}", password_local );
var note = decrypt( "{{ file[ 'note' ] }}", password_local ); var note = decrypt( "{{ file[ 'note' ] }}", password_local );
......
views/submission/templates/submission/new.html
View file @ 8f1b2330
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
submission_id = "{{ submission_id }}"; submission_id = "{{ submission_id }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
</script> </script>
</head> </head>
<body class="icnml_main_layout"> <body class="icnml_main_layout">
......
views/submission/templates/submission/segment.html
View file @ 8f1b2330
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
var tp_filename = decrypt( "{{ tp_filename }}", password_local ); var tp_filename = decrypt( "{{ tp_filename }}", password_local );
......
views/submission/templates/submission/segment_list.html
View file @ 8f1b2330
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<script type="text/javascript"> <script type="text/javascript">
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var filename = decrypt( "{{ filename }}", password_local ); var filename = decrypt( "{{ filename }}", password_local );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
</script> </script>
......
views/submission/templates/submission/set_gp.html
View file @ 8f1b2330
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
submission_id = "{{ submission_id }}"; submission_id = "{{ submission_id }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ user.nickname }}", password_local ); var nickname = decrypt( "{{ user.nickname }}", password_local );
var update_nickname = function() var update_nickname = function()
......
views/submission/templates/submission/summary.html
View file @ 8f1b2330
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
</script> </script>
</head> </head>
......
views/submission/templates/submission/tenprint_list.html
View file @ 8f1b2330
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<script type="text/javascript"> <script type="text/javascript">
baseurl = "{{ baseurl }}"; baseurl = "{{ baseurl }}";
var password_local = decrypt( sessionStorage.getItem( "session_key" ), "{{ session_security_key }}" ); var password_local = localStorage.getItem( "session_key" );
var nickname = decrypt( "{{ nickname }}", password_local ); var nickname = decrypt( "{{ nickname }}", password_local );
</script> </script>
......