-
+
diff --git a/admin/src/admin/static/templates/pages/roles.html b/admin/src/admin/static/templates/pages/roles.html
index 877930d..6068fc5 100644
--- a/admin/src/admin/static/templates/pages/roles.html
+++ b/admin/src/admin/static/templates/pages/roles.html
@@ -25,7 +25,6 @@
- |
Id |
Name |
diff --git a/admin/src/admin/static/templates/pages/users.html b/admin/src/admin/static/templates/pages/users.html
index 286d826..0278eab 100644
--- a/admin/src/admin/static/templates/pages/users.html
+++ b/admin/src/admin/static/templates/pages/users.html
@@ -24,17 +24,16 @@
- |
- Avatar |
Enabled |
- Username |
+ Avatar |
+ Role |
Actions |
+ Username |
First |
Last |
Email |
Groups |
- Roles |
-
+ Quota |
diff --git a/admin/src/admin/views/ApiViews.py b/admin/src/admin/views/ApiViews.py
index 9c3287c..c9869cc 100644
--- a/admin/src/admin/views/ApiViews.py
+++ b/admin/src/admin/views/ApiViews.py
@@ -9,7 +9,9 @@ import time,json
import sys,os
from flask import render_template, Response, request, redirect, url_for, jsonify
import concurrent.futures
-from flask_login import login_required
+from flask_login import current_user, login_required
+from .decorators import is_admin
+
# import Queue
import threading
threads={}
@@ -17,6 +19,8 @@ threads={}
from keycloak.exceptions import KeycloakGetError
+from ..lib.exceptions import UserExists, UserNotFound
+
@app.route('/api/resync')
@login_required
def resync():
@@ -27,6 +31,7 @@ def resync():
@login_required
def users(provider=False):
if request.method == 'DELETE':
+ if current_user.role != 'admin': return json.dumps({}), 301, {'Content-Type': 'application/json'}
if provider == 'keycloak':
return json.dumps(app.admin.delete_keycloak_users()), 200, {'Content-Type': 'application/json'}
if provider == 'nextcloud':
@@ -34,11 +39,18 @@ def users(provider=False):
if provider == 'moodle':
return json.dumps(app.admin.delete_moodle_users()), 200, {'Content-Type': 'application/json'}
if request.method == 'POST':
+ if current_user.role != 'admin': return json.dumps({}), 301, {'Content-Type': 'application/json'}
if provider == 'moodle':
return json.dumps(app.admin.sync_to_moodle()), 200, {'Content-Type': 'application/json'}
if provider == 'nextcloud':
return json.dumps(app.admin.sync_to_nextcloud()), 200, {'Content-Type': 'application/json'}
- return json.dumps(app.admin.get_mix_users()), 200, {'Content-Type': 'application/json'}
+
+ users = app.admin.get_mix_users()
+
+ if current_user.role != 'admin':
+ for user in users:
+ user['keycloak_groups'] = [g for g in user['keycloak_groups'] if g not in ['/admin','/manager','/teacher','/student']]
+ return json.dumps(users), 200, {'Content-Type': 'application/json'}
# Update pwd
@@ -56,35 +68,84 @@ def user_password(userid=False):
res = app.admin.user_update_password(userid,password,temporary)
return json.dumps({}), 200, {'Content-Type': 'application/json'}
except KeycloakGetError as e:
- print(e.error_message.decode("utf-8"))
- return e.error_message, e.response_code, {'Content-Type': 'application/json'}
+ log.error(e.error_message.decode("utf-8"))
+ return json.dumps({'msg':'Update password error.'}), 500, {'Content-Type': 'application/json'}
- return json.dumps({}), 301, {'Content-Type': 'application/json'}
+ return json.dumps({}), 405, {'Content-Type': 'application/json'}
# User
-@app.route('/api/user/', methods=['POST', 'PUT', 'GET', 'DELETE'])
+@app.route('/api/user', methods=['POST'])
+@app.route('/api/user/', methods=['PUT', 'GET', 'DELETE'])
@login_required
def user(userid=None):
if request.method == 'DELETE':
- res = app.admin.delete_user(userid)
+ app.admin.delete_user(userid)
return json.dumps({}), 200, {'Content-Type': 'application/json'}
- # return json.dumps(), 301, {'Content-Type': 'application/json'}
if request.method == 'POST':
- pass
+ data=request.get_json(force=True)
+ if app.admin.get_user_username(data['username']):
+ return json.dumps({'msg':'Add user error: already exists.'}), 409, {'Content-Type': 'application/json'}
+ data['enabled']=True if data.get('enabled',False) else False
+ data['quota']=data['quota'] if data['quota'] != 'false' else False
+ data['groups']=data['groups'] if data.get('groups',False) else []
+ if 'external' in threads.keys():
+ if threads['external'] is not None and threads['external'].is_alive():
+ return json.dumps({'msg':'Precondition failed: already adding users'}), 412, {'Content-Type': 'application/json'}
+ else:
+ threads['external']=None
+ try:
+ threads['external'] = threading.Thread(target=app.admin.add_user, args=(data,))
+ threads['external'].start()
+ return json.dumps({}), 200, {'Content-Type': 'application/json'}
+ except:
+ log.error(traceback.format_exc())
+ return json.dumps({'msg':'Add user error.'}), 500, {'Content-Type': 'application/json'}
+
if request.method == 'PUT':
- pass
+ data=request.get_json(force=True)
+ data['enabled']=True if data.get('enabled',False) else False
+ data['groups']=data['groups'] if data.get('groups',False) else []
+ data['roles']=[data.pop('role-keycloak')]
+ try:
+ app.admin.user_update(data)
+ return json.dumps({}), 200, {'Content-Type': 'application/json'}
+ except UserNotFound:
+ return json.dumps({'msg':'User not found.'}), 404, {'Content-Type': 'application/json'}
if request.method == 'DELETE':
pass
if request.method == 'GET':
- res = app.admin.get_user(userid)
- return json.dumps(res), 200, {'Content-Type': 'application/json'}
+ user = app.admin.get_user(userid)
+ if not user: return json.dumps({'msg':'User not found.'}), 404, {'Content-Type': 'application/json'}
+ return json.dumps(user), 200, {'Content-Type': 'application/json'}
@app.route('/api/roles')
@login_required
def roles():
sorted_roles = sorted(app.admin.get_roles(), key=lambda k: k['name'])
+ if current_user.role != "admin":
+ sorted_roles = [sr for sr in sorted_roles if sr['name'] != 'admin']
return json.dumps(sorted_roles), 200, {'Content-Type': 'application/json'}
+@app.route('/api/group', methods=['POST','DELETE'])
+@app.route('/api/group/', methods=['PUT', 'GET', 'DELETE'])
+@login_required
+def group(group_id=False):
+ if request.method == 'POST':
+ data=request.get_json(force=True)
+ data['parent']=data['parent'] if data['parent'] != '' else None
+ return json.dumps(app.admin.add_group(data)), 200, {'Content-Type': 'application/json'}
+ if request.method == 'DELETE':
+ try:
+ data=request.get_json(force=True)
+ print(data)
+ except:
+ data=False
+
+ if data:
+ res = app.admin.delete_group_by_path(data['path'])
+ else:
+ res = app.admin.delete_group_by_id(group_id)
+ return json.dumps(res), 200, {'Content-Type': 'application/json'}
@app.route('/api/groups')
@app.route('/api/groups/', methods=['POST', 'PUT', 'GET', 'DELETE'])
@@ -92,6 +153,11 @@ def roles():
def groups(provider=False):
if request.method == 'GET':
sorted_groups = sorted(app.admin.get_mix_groups(), key=lambda k: k['name'])
+ if current_user.role != "admin":
+ ## internal groups should be avoided as are assigned with the role
+ sorted_groups = [sg for sg in sorted_groups if sg['path'] not in ['/admin','/manager','/teacher','/student'] and sg['path'].startswith('/')]
+ else:
+ sorted_groups = [sg for sg in sorted_groups if sg['path'].startswith('/')]
return json.dumps(sorted_groups), 200, {'Content-Type': 'application/json'}
if request.method == 'DELETE':
if provider == 'keycloak':
diff --git a/admin/src/admin/views/WebViews.py b/admin/src/admin/views/WebViews.py
index 26565e7..fca1c94 100644
--- a/admin/src/admin/views/WebViews.py
+++ b/admin/src/admin/views/WebViews.py
@@ -10,6 +10,7 @@ import sys,os
from flask import render_template, Response, request, redirect, url_for, jsonify, send_file
import concurrent.futures
from flask_login import login_required
+from .decorators import is_admin
from pprint import pprint
from ..lib.avatars import Avatars
@@ -70,17 +71,20 @@ def avatar(userid):
@app.route('/sysadmin/users')
@login_required
+@is_admin
def web_sysadmin_users():
return render_template('pages/sysadmin/users.html', title="SysAdmin Users", nav="SysAdminUsers")
@app.route('/sysadmin/groups')
@login_required
+@is_admin
def web_sysadmin_groups():
return render_template('pages/sysadmin/groups.html', title="SysAdmin Groups", nav="SysAdminGroups")
@app.route('/sysadmin/external')
@login_required
+@is_admin
## SysAdmin role
def web_sysadmin_external():
return render_template('pages/sysadmin/external.html', title="External", nav="External")
diff --git a/admin/src/admin/views/decorators.py b/admin/src/admin/views/decorators.py
index 3b6c867..6264a84 100644
--- a/admin/src/admin/views/decorators.py
+++ b/admin/src/admin/views/decorators.py
@@ -3,9 +3,16 @@
from functools import wraps
from flask import request, redirect, url_for
-from flask_login import logout_user
+from flask_login import current_user, logout_user
import socket
+def is_admin(fn):
+ @wraps(fn)
+ def decorated_view(*args, **kwargs):
+ if current_user.role == 'admin': return fn(*args, **kwargs)
+ return redirect(url_for('login'))
+ return decorated_view
+
def is_internal(fn):
@wraps(fn)
def decorated_view(*args, **kwargs):
diff --git a/docker-compose-parts/admin.devel.yml b/docker-compose-parts/admin.devel.yml
new file mode 100644
index 0000000..2bd8527
--- /dev/null
+++ b/docker-compose-parts/admin.devel.yml
@@ -0,0 +1,7 @@
+---
+version: '3.7'
+services:
+ isard-sso-admin:
+ volumes:
+ - ${BUILD_ROOT_PATH}/admin/src:/admin:rw
+ command: /bin/sleep infinity
\ No newline at end of file
diff --git a/docker-compose-parts/admin.yml b/docker-compose-parts/admin.yml
index faa6038..1a2f412 100644
--- a/docker-compose-parts/admin.yml
+++ b/docker-compose-parts/admin.yml
@@ -6,14 +6,14 @@ services:
context: ${BUILD_ROOT_PATH}
dockerfile: admin/docker/Dockerfile
target: production
- args: ## DEVELOPMENT
- SSH_ROOT_PWD: ${IPA_ADMIN_PWD}
- SSH_PORT: 2022
+ # args: ## DEVELOPMENT
+ # SSH_ROOT_PWD: ${IPA_ADMIN_PWD}
+ # SSH_PORT: 2022
networks:
- isard_net
- ports:
- - "2022:22"
- - "9000:9000"
+ # ports:
+ # - "2022:22"
+ # - "9000:9000"
restart: unless-stopped
volumes:
- /etc/localtime:/etc/localtime:ro
@@ -26,4 +26,3 @@ services:
- .env
environment:
- VERIFY="false" # In development do not verify certificates
- command: sleep infinity
'
+ // }}]
} );
});
\ No newline at end of file
diff --git a/admin/src/admin/static/js/status_socket.js b/admin/src/admin/static/js/status_socket.js
index 47c7519..5241a07 100644
--- a/admin/src/admin/static/js/status_socket.js
+++ b/admin/src/admin/static/js/status_socket.js
@@ -21,7 +21,8 @@ socket.on('notify-create', function(data) {
notice[data.id] = new PNotify({
title: data.title,
text: data.text,
- hide: false
+ hide: false,
+ type: data.type
});
});
@@ -36,7 +37,8 @@ socket.on('notify-increment', function(data) {
notice[data.id] = new PNotify({
title: data.title,
text: data.text,
- hide: false
+ hide: false,
+ type: data.type
});
}
// console.log(data.text)
diff --git a/admin/src/admin/static/js/users.js b/admin/src/admin/static/js/users.js
index a4ee499..400fc5f 100644
--- a/admin/src/admin/static/js/users.js
+++ b/admin/src/admin/static/js/users.js
@@ -87,33 +87,168 @@ $(document).ready(function() {
// Open new user modal
$('.btn-new-user').on('click', function () {
+ $("#modalAddUserForm")[0].reset();
+ $.ajax({
+ type: "GET",
+ "url": "/api/user_password",
+ success: function(data)
+ {
+ $('#modalAddUser #password').val(data)
+ },
+ error: function(data)
+ {
+ alert('Something went wrong on our side...')
+ }
+ });
+ $('#modalAddUser #enabled').prop('checked',true).iCheck('update');
$('#modalAddUser').modal({
backdrop: 'static',
keyboard: false
}).modal('show');
});
+ //has uppercase
+ window.Parsley.addValidator('uppercase', {
+ requirementType: 'number',
+ validateString: function(value, requirement) {
+ var uppercases = value.match(/[A-Z]/g) || [];
+ return uppercases.length >= requirement;
+ },
+ messages: {
+ en: 'Your password must contain at least (%s) uppercase letter.'
+ }
+ });
+
+ //has lowercase
+ window.Parsley.addValidator('lowercase', {
+ requirementType: 'number',
+ validateString: function(value, requirement) {
+ var lowecases = value.match(/[a-z]/g) || [];
+ return lowecases.length >= requirement;
+ },
+ messages: {
+ en: 'Your password must contain at least (%s) lowercase letter.'
+ }
+ });
// Send new user form
$('#modalAddUser #send').on('click', function () {
var form = $('#modalAddUserForm');
- formdata = form.serializeObject()
- console.log('NEW USER')
- console.log(formdata)
- // $.ajax({
- // type: "POST",
- // "url": "/groups_list",
- // success: function(data)
- // {
- // console.log('SUCCESS')
- // // $("#modalAddUser").modal('hide');
- // },
- // error: function(data)
- // {
- // alert('Something went wrong on our side...')
- // }
- // });
+ form.parsley().validate();
+ if (form.parsley().isValid()){
+ formdata = form.serializeObject()
+ // console.log('NEW USER')
+ // console.log(formdata)
+
+ $.ajax({
+ type: "POST",
+ "url": "/api/user",
+ data: JSON.stringify(formdata),
+ complete: function(jqXHR, textStatus) {
+ switch (jqXHR.status) {
+ case 200:
+ $("#modalAddUser").modal('hide');
+ break;
+ case 409:
+ new PNotify({
+ title: "Add user error",
+ text: $.parseJSON(jqXHR.responseText)['msg'],
+ hide: true,
+ delay: 3000,
+ icon: 'fa fa-alert-sign',
+ opacity: 1,
+ type: 'error'
+ });
+ break;
+ case 412:
+ new PNotify({
+ title: "Add user error",
+ text: $.parseJSON(jqXHR.responseText)['msg'],
+ hide: true,
+ delay: 3000,
+ icon: 'fa fa-alert-sign',
+ opacity: 1,
+ type: 'error'
+ });
+ break;
+ default:
+ alert("Server error.");
+ }
+ }
+ });
+ }
+ table.ajax.reload();
});
+ // $("#modalEditUser #send").on('click', function(e){
+ // var form = $('#modalEditUserForm');
+ // form.parsley().validate();
+ // if (form.parsley().isValid()){
+ // data=$('#modalEditUserForm').serializeObject();
+ // data['id']=$('#modalEditUserForm #id').val();
+ // console.log('Editing user...')
+ // console.log(data)
+ // }
+ // });
+
+ $('#modalEditUser #send').on('click', function () {
+ var form = $('#modalEditUserForm');
+ form.parsley().validate();
+ if (form.parsley().isValid()){
+ formdata = form.serializeObject()
+ formdata['id']=$('#modalEditUserForm #id').val();
+ formdata['username']=$('#modalEditUserForm #username').val();
+ console.log('UPDATE USER')
+ console.log(formdata)
+ $.ajax({
+ type: "PUT",
+ "url": "/api/user/"+formdata['id'],
+ data: JSON.stringify(formdata),
+ complete: function(jqXHR, textStatus) {
+ switch (jqXHR.status) {
+ case 200:
+ $("#modalEditUser").modal('hide');
+ break;
+ case 404:
+ new PNotify({
+ title: "Update user error",
+ text: $.parseJSON(jqXHR.responseText)['msg'],
+ hide: true,
+ delay: 3000,
+ icon: 'fa fa-alert-sign',
+ opacity: 1,
+ type: 'error'
+ });
+ break;
+ case 409:
+ new PNotify({
+ title: "Add user error",
+ text: $.parseJSON(jqXHR.responseText)['msg'],
+ hide: true,
+ delay: 3000,
+ icon: 'fa fa-alert-sign',
+ opacity: 1,
+ type: 'error'
+ });
+ break;
+ case 412:
+ new PNotify({
+ title: "Add user error",
+ text: $.parseJSON(jqXHR.responseText)['msg'],
+ hide: true,
+ delay: 3000,
+ icon: 'fa fa-alert-sign',
+ opacity: 1,
+ type: 'error'
+ });
+ break;
+ default:
+ alert("Server error.");
+ }
+ }
+ });
+ }
+ table.ajax.reload();
+ });
//DataTable Main renderer
var table = $('#users').DataTable({
"ajax": {
@@ -127,17 +262,16 @@ $(document).ready(function() {
"rowId": "id",
"deferRender": true,
"columns": [
- {"data": null, "defaultContent":'',"width": "1px"},
// {
// "className": 'details-control',
// "orderable": false,
// "data": null,
// "width": "10px",
// "defaultContent": ''
- // },
+ // },
+ { "data": "enabled", "width": "1px" },
{ "data": "id", "width": "10px" },
- { "data": "enabled", "width": "10px" },
- { "data": "username", "width": "10px"},
+ { "data": "roles", "width": "10px" },
{
"className": 'actions-control',
"orderable": false,
@@ -146,14 +280,15 @@ $(document).ready(function() {
"defaultContent": ' \
\
'
- },
- { "data": "first", "width": "10px"},
- { "data": "last", "width": "150px"},
+ },
+ { "data": "username", "width": "10px"},
+ { "data": "first", "width": "10px"},
+ { "data": "last", "width": "150px"},
{ "data": "email", "width": "10px"},
{ "data": "keycloak_groups", "width": "50px" },
- { "data": "roles", "width": "10px" },
+ { "data": "quota", "width": "10px", "default": "-"},
],
- "order": [[6, 'asc']],
+ "order": [[6, 'asc']],
"columnDefs": [ {
"targets": 1,
"render": function ( data, type, full, meta ) {
@@ -161,7 +296,7 @@ $(document).ready(function() {
return '
'
}},
{
- "targets": 2,
+ "targets": 0,
"render": function ( data, type, full, meta ) {
if(full.enabled){
return ''
@@ -170,7 +305,12 @@ $(document).ready(function() {
};
}},
{
- "targets": 3,
+ "targets": 2,
+ "render": function ( data, type, full, meta ) {
+ return full.roles[0][0].toUpperCase() + full.roles[0].slice(1);
+ }},
+ {
+ "targets": 4,
"render": function ( data, type, full, meta ) {
return ''+full.username+''
}},
@@ -183,31 +323,40 @@ $(document).ready(function() {
})
return grups
}},
+ {
+ "targets": 9,
+ "render": function ( data, type, full, meta ) {
+ if(full.quota == false){
+ return 'Unlimited'
+ }else{
+ return full.quota
+ }
+ }},
]
} );
- $template = $(".template-detail-users");
+ // $template = $(".template-detail-users");
- $('#users').find('tbody').on('click', 'td.details-control', function () {
- var tr = $(this).closest('tr');
- var row = table.row( tr );
+ // $('#users').find('tbody').on('click', 'td.details-control', function () {
+ // var tr = $(this).closest('tr');
+ // var row = table.row( tr );
- if ( row.child.isShown() ) {
- // This row is already open - close it
- row.child.hide();
- tr.removeClass('shown');
- }
- else {
- // Close other rows
- if ( table.row( '.shown' ).length ) {
- $('.details-control', table.row( '.shown' ).node()).click();
- }
- // Open this row
- row.child( addUserDetailPannel(row.data()) ).show();
- tr.addClass('shown');
- actionsUserDetail()
- }
- } );
+ // if ( row.child.isShown() ) {
+ // // This row is already open - close it
+ // row.child.hide();
+ // tr.removeClass('shown');
+ // }
+ // else {
+ // // Close other rows
+ // if ( table.row( '.shown' ).length ) {
+ // $('.details-control', table.row( '.shown' ).node()).click();
+ // }
+ // // Open this row
+ // row.child( addUserDetailPannel(row.data()) ).show();
+ // tr.addClass('shown');
+ // actionsUserDetail()
+ // }
+ // } );
$('#users').find(' tbody').on( 'click', 'button', function () {
var data = table.row( $(this).parents('tr') ).data();
@@ -291,7 +440,7 @@ $(document).ready(function() {
id=$('#modalPasswdUserForm #id').val();
$.ajax({
type: "PUT",
- url:"/api/user//+" + id,
+ url:"/api/user_password/" + id,
data: JSON.stringify(formdata),
success: function(data)
{
@@ -320,26 +469,15 @@ $(document).ready(function() {
}
});
- $("#modalEditUser #send").on('click', function(e){
- var form = $('#modalEditUserForm');
- form.parsley().validate();
- if (form.parsley().isValid()){
- data=$('#modalEditUserForm').serializeObject();
- data['id']=$('#modalEditUserForm #id').val();
- console.log('Editing user...')
- console.log(data)
- }
- });
+ // function addUserDetailPannel ( d ) {
+ // $newPanel = $template.clone();
+ // $newPanel.html(function(i, oldHtml){
+ // return oldHtml.replace(/d.id/g, d.id).replace(/d.username/g, d.username);
+ // });
+ // return $newPanel
+ // }
- function addUserDetailPannel ( d ) {
- $newPanel = $template.clone();
- $newPanel.html(function(i, oldHtml){
- return oldHtml.replace(/d.id/g, d.id).replace(/d.username/g, d.username);
- });
- return $newPanel
- }
-
- function actionsUserDetail(){
+ // function actionsUserDetail(){
// $('.btn-passwd').on('click', function () {
// var closest=$(this).closest("div").parent();
@@ -392,13 +530,15 @@ $(document).ready(function() {
// }).on('pnotify.cancel', function() {
// });
// });
- }
+ // }
+
function setUserDefault(div_id, user_id) {
$.ajax({
type: "GET",
url:"/api/user/" + user_id,
success: function(data)
{
+ console.log(data)
if (data.enabled) {
$(div_id + ' #enabled').iCheck('check')
}
@@ -407,11 +547,18 @@ $(document).ready(function() {
$(div_id + ' #email').val(data.email);
$(div_id + ' #firstname').val(data.first);
$(div_id + ' #lastname').val(data.last);
+ if(data.quota == false){
+ $(div_id + ' #quota').val('false')
+ }else{
+ $(div_id + ' #quota').val(data.quota);
+ }
$(div_id + ' .groups-select').val(data.keycloak_groups);
+
// $(div_id + ' .role-moodle-select').val(data.keycloak_roles);
// $(div_id + ' .role-nextcloud-select').val(data.roles);
$(div_id + ' .role-keycloak-select').val(data.roles[0]);
$('.groups-select').trigger('change');
+
// $('.groups-select, .role-moodle-select, .role-nextcloud-select, .role-keycloak-select').trigger('change');
}
});
diff --git a/admin/src/admin/static/templates/pages/groups.html b/admin/src/admin/static/templates/pages/groups.html
index 9f3a03f..73446e6 100644
--- a/admin/src/admin/static/templates/pages/groups.html
+++ b/admin/src/admin/static/templates/pages/groups.html
@@ -15,7 +15,7 @@