simon/RadMac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove duplicate user

Browse Source
This commit is contained in:
Simon Cloutier
2025-03-30 17:13:35 -04:00
parent f370666d79
commit 1206c90eeb
2 changed files with 115 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
app/app.py
View File

@@ -90,30 +90,35 @@ def sql():
@app.route('/user_list') @app.route('/user_list')
def user_list(): def user_list():
"""Displays the user list with VLAN IDs.""" """Displays the user list with VLAN IDs and descriptions from rad_description."""
db = get_db() db = get_db()
if db is None: if db is None:
return "Database connection failed", 500 return "Database connection failed", 500
cursor = db.cursor(dictionary=True) cursor = db.cursor(dictionary=True)
try: try:
# Fetch users and their group assignments # Fetch users, their group assignments, and descriptions from rad_description
cursor.execute(""" cursor.execute("""
SELECT r.username AS mac_address, r.value AS description, ug.groupname AS vlan_id SELECT
r.username AS mac_address,
rd.description AS description,
ug.groupname AS vlan_id
FROM radcheck r FROM radcheck r
LEFT JOIN radusergroup ug ON r.username = ug.username LEFT JOIN radusergroup ug ON r.username = ug.username
WHERE r.attribute = 'User-Description' LEFT JOIN rad_description rd ON r.username = rd.username
""") """) #removed WHERE clause
results = cursor.fetchall() results = cursor.fetchall()
print("Results:", results) #added print statement
# Fetch all group names for the dropdown # Fetch all group names for the dropdown
cursor.execute("SELECT groupname FROM radgroupcheck") cursor.execute("SELECT groupname FROM radgroupcheck")
groups = cursor.fetchall() groups = cursor.fetchall()
groups = [{'groupname': row['groupname']} for row in groups] # changed groups = [{'groupname': row['groupname']} for row in groups]
print("Groups:", groups) #added print statement
cursor.close() cursor.close()
db.close() db.close()
return render_template('user_list_inline_edit.html', results=results, groups=groups) # added groups return render_template('user_list_inline_edit.html', results=results, groups=groups)
except mysql.connector.Error as e: except mysql.connector.Error as e:
print(f"Database error: {e}") print(f"Database error: {e}")
cursor.close() cursor.close()
@@ -132,12 +137,14 @@ def update_user():
try: try:
db.autocommit = False db.autocommit = False
# Update rad_description table
cursor.execute(""" cursor.execute("""
UPDATE radcheck UPDATE rad_description
SET value = %s SET description = %s
WHERE username = %s AND attribute = 'User-Description' WHERE username = %s
""", (description, mac_address)) """, (description, mac_address))
# Update radgroupreply table for VLAN ID
cursor.execute(""" cursor.execute("""
UPDATE radgroupreply rgr UPDATE radgroupreply rgr
SET value = %s SET value = %s
@@ -169,65 +176,77 @@ def delete_user(mac_address):
if db: if db:
cursor = db.cursor() cursor = db.cursor()
try: try:
db.autocommit = False #Start transaction
# Delete from rad_description
cursor.execute("DELETE FROM rad_description WHERE username = %s", (mac_address,))
# Delete from radcheck
cursor.execute("DELETE FROM radcheck WHERE username = %s", (mac_address,)) cursor.execute("DELETE FROM radcheck WHERE username = %s", (mac_address,))
db.commit()
#Delete from radusergroup
cursor.execute("DELETE FROM radusergroup WHERE username = %s", (mac_address,))
db.commit() #Commit transaction
db.autocommit = True
cursor.close() cursor.close()
db.close() db.close()
return redirect(url_for('user_list')) return redirect(url_for('user_list'))
except mysql.connector.Error as err: except mysql.connector.Error as err:
print(f"Database Error: {err}") print(f"Database Error: {err}")
db.rollback() db.rollback() #Roll back transaction on error
db.autocommit = True
cursor.close() cursor.close()
db.close() db.close()
return redirect(url_for('user_list')) return redirect(url_for('user_list'))
return "Database Connection Failed" return "Database Connection Failed"
@app.route('/edit_user/<mac_address>', methods=['GET', 'POST']) # @app.route('/edit_user/<mac_address>', methods=['GET', 'POST'])
def edit_user(mac_address): # def edit_user(mac_address):
db = get_db() # db = get_db()
if db: # if db:
cursor = db.cursor(dictionary=True) # cursor = db.cursor(dictionary=True)
if request.method == 'POST': # if request.method == 'POST':
description = request.form['description'] # description = request.form['description']
vlan_id = request.form['vlan_id'] # vlan_id = request.form['vlan_id']
cursor.execute(""" # cursor.execute("""
UPDATE radcheck # UPDATE radcheck
SET value = %s # SET value = %s
WHERE username = %s AND attribute = 'User-Description' # WHERE username = %s AND attribute = 'User-Description'
""", (description, mac_address)) # """, (description, mac_address))
cursor.execute(""" # cursor.execute("""
UPDATE radgroupreply rgr # UPDATE radgroupreply rgr
SET value = %s # SET value = %s
WHERE rgr.groupname = (SELECT groupname FROM radusergroup rug WHERE rug.username = %s LIMIT 1) # WHERE rgr.groupname = (SELECT groupname FROM radusergroup rug WHERE rug.username = %s LIMIT 1)
AND rgr.attribute = 'Tunnel-Private-Group-Id' # AND rgr.attribute = 'Tunnel-Private-Group-Id'
""", (vlan_id, mac_address)) # """, (vlan_id, mac_address))
db.commit() # db.commit()
cursor.close() # cursor.close()
db.close() # db.close()
return redirect(url_for('user_list')) # return redirect(url_for('user_list'))
else: # else:
cursor.execute(""" # cursor.execute("""
SELECT # SELECT
rc.username AS mac_address, # rc.username AS mac_address,
IFNULL((SELECT value FROM radgroupreply rgr # IFNULL((SELECT value FROM radgroupreply rgr
WHERE rgr.groupname = (SELECT groupname FROM radusergroup rug WHERE rug.username = rc.username LIMIT 1) # WHERE rgr.groupname = (SELECT groupname FROM radusergroup rug WHERE rug.username = rc.username LIMIT 1)
AND rgr.attribute = 'Tunnel-Private-Group-Id' LIMIT 1), 'N/A') AS vlan_id, # AND rgr.attribute = 'Tunnel-Private-Group-Id' LIMIT 1), 'N/A') AS vlan_id,
IFNULL((SELECT value FROM radcheck rch # IFNULL((SELECT value FROM radcheck rch
WHERE rch.username = rc.username AND rch.attribute = 'User-Description' LIMIT 1), 'N/A') AS description # WHERE rch.username = rc.username AND rch.attribute = 'User-Description' LIMIT 1), 'N/A') AS description
FROM radcheck rc # FROM radcheck rc
WHERE rc.username = %s # WHERE rc.username = %s
GROUP BY rc.username; # GROUP BY rc.username;
""", (mac_address,)) # """, (mac_address,))
user = cursor.fetchone() # user = cursor.fetchone()
cursor.close() # cursor.close()
db.close() # db.close()
return render_template('edit_user.html', user=user) # return render_template('edit_user.html', user=user)
return "Database Connection Failed" # return "Database Connection Failed"
@app.route('/groups') @app.route('/groups')
def groups(): def groups():
@@ -520,6 +539,8 @@ def add_user():
cursor = db.cursor() cursor = db.cursor()
try: try:
db.autocommit = False #Start Transaction
# Check if user already exists # Check if user already exists
cursor.execute("SELECT username FROM radcheck WHERE username = %s", (mac_address,)) cursor.execute("SELECT username FROM radcheck WHERE username = %s", (mac_address,))
if cursor.fetchone(): if cursor.fetchone():
@@ -530,9 +551,14 @@ def add_user():
# Insert into radcheck, setting password to MAC address # Insert into radcheck, setting password to MAC address
cursor.execute(""" cursor.execute("""
INSERT INTO radcheck (username, attribute, op, value) INSERT INTO radcheck (username, attribute, op, value)
VALUES (%s, 'Cleartext-Password', ':=', %s), VALUES (%s, 'Cleartext-Password', ':=', %s)
(%s, 'User-Description', ':=', %s) """, (mac_address, mac_address)) # Use mac_address for both username and password
""", (mac_address, mac_address, mac_address, description)) # Use mac_address for both username and password
# Insert description into rad_description
cursor.execute("""
INSERT INTO rad_description (username, description)
VALUES (%s, %s)
""", (mac_address, description))
# Insert into radusergroup with the selected group # Insert into radusergroup with the selected group
cursor.execute(""" cursor.execute("""
@@ -540,21 +566,24 @@ def add_user():
VALUES (%s, %s) VALUES (%s, %s)
""", (mac_address, vlan_id)) # Use vlan_id """, (mac_address, vlan_id)) # Use vlan_id
db.commit() db.commit() #Commit transaction
db.autocommit = True
cursor.close() cursor.close()
db.close() db.close()
return jsonify({'success': True, 'message': 'User added successfully'}) return jsonify({'success': True, 'message': 'User added successfully'})
except mysql.connector.Error as err: except mysql.connector.Error as err:
print(f"Database Error: {err}") print(f"Database Error: {err}")
db.rollback() db.rollback() #Rollback transaction on error.
db.autocommit = True
cursor.close() cursor.close()
db.close() db.close()
return jsonify({'success': False, 'message': f"Database error: {err}"}), 500 return jsonify({'success': False, 'message': f"Database error: {err}"}), 500
except Exception as e: except Exception as e:
print(f"Error adding user: {e}") print(f"Error adding user: {e}")
db.rollback() db.rollback() #Rollback transaction on error.
db.autocommit = True
cursor.close() cursor.close()
db.close() db.close()
return jsonify({'success': False, 'message': str(e)}), 500 return jsonify({'success': False, 'message': str(e)}), 500

189
app/templates/user_list_inline_edit.html
View File

@@ -30,9 +30,7 @@
</td> </td>
<td> <td>
<button onclick="updateUser('{{ user.mac_address }}')">✅</button> <button onclick="updateUser('{{ user.mac_address }}')">✅</button>
<button onclick="location.reload()">❌</button>
<a href="/delete_user/{{ user.mac_address }}" onclick="saveScrollPosition()">🗑️</a> <a href="/delete_user/{{ user.mac_address }}" onclick="saveScrollPosition()">🗑️</a>
<button onclick="duplicateUser('{{ user.mac_address }}')">Duplicate</button>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@@ -77,44 +75,7 @@
</div> </div>
</dialog> </dialog>
<dialog id="duplicate-dialog">
<div id="duplicate-dialog-content">
<table border="1">
<thead>
<tr>
<th>MAC Address</th>
<th>Description</th>
<th>VLAN ID</th>
</tr>
</thead>
<tbody>
<tr>
<td><input type="text" id="dup-mac"></td>
<td><input type="text" id="dup-description"></td>
<td>
<select id="dup-vlan_id">
{% for group in groups %}
<option value="{{ group.groupname }}">
{{ group.groupname }}
</option>
{% endfor %}
</select>
</td>
</tr>
</tbody>
</table>
</div>
<div style="display: flex; justify-content: flex-end; margin-top: 10px;">
<button id="close-duplicate-dialog">Cancel</button>
<button id="save-duplicated-user">Save</button>
</div>
</dialog>
<style> <style>
.merged-cell {
border: none;
}
#cancel-add-user-dialog { #cancel-add-user-dialog {
border-radius: 5px; border-radius: 5px;
padding: 10px; padding: 10px;
@@ -150,17 +111,18 @@
</style> </style>
<script> <script>
const groups = {{ groups | tojson | safe }};
function updateUser(mac_address) { function updateUser(mac_address) {
const description = document.getElementById('description-' + mac_address).value; const description = document.getElementById('description-' + mac_address).value;
const vlan_id = document.getElementById('vlan_id-' + mac_address).value; const vlan_id = document.getElementById('vlan_id-' + mac_address).value;
const mac_address_input = document.getElementById('mac_address-' + mac_address).value; //added
fetch('/update_user', { fetch('/update_user', {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
}, },
body: `mac_address=${mac_address}&description=${description}&vlan_id=${vlan_id}&new_mac_address=${mac_address_input}` //added new param body: `mac_address=${mac_address}&description=${description}&vlan_id=${vlan_id}`
}) })
.then(response => response.text()) .then(response => response.text())
.then(data => { .then(data => {
@@ -184,92 +146,6 @@
} }
} }
function duplicateUser(mac_address) {
console.log("duplicateUser called with mac_address:", mac_address);
fetch('/duplicate_user', {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
body: `mac_address=${mac_address}`
})
.then(response => {
console.log("Response status:", response.status);
console.log("Response text:", response.text());
return response.json()
})
.then(data => {
console.log("Response data:", data);
const userData = data;
if (userData) {
document.getElementById('dup-mac').value = userData.mac_address;
document.getElementById('dup-description').value = userData.description;
const vlanSelect = document.getElementById('dup-vlan_id');
vlanSelect.innerHTML = '';
{% for group in groups %}
let option = document.createElement('option');
option.value = "{{ group.groupname }}";
option.textContent = "{{ group.groupname }}";
if ("{{ group.groupname }}" === userData.vlan_id) {
option.selected = true;
}
vlanSelect.appendChild(option);
{% endfor %}
document.getElementById('duplicate-dialog').showModal();
} else {
alert("Failed to retrieve user data for duplication.");
}
});
}
}
document.getElementById('close-duplicate-dialog').addEventListener('click', () => {
document.getElementById('duplicate-dialog').close();
});
document.getElementById('save-duplicated-user').addEventListener('click', () => {
saveDuplicatedUser();
});
function saveDuplicatedUser() {
let mac = document.getElementById('dup-mac').value;
let description = document.getElementById('dup-description').value;
let vlan_id = document.getElementById('dup-vlan_id').value;
fetch('/add_user', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ mac_address: mac, description: description, vlan_id: vlan_id }),
})
.then((response) => {
if (!response.ok) {
return response.text().then((text) => {
throw new Error(`HTTP error! status: ${response.status}, body: ${text}`);
});
}
return response.json();
})
.then((data) => {
console.log("Server response:", data);
if (data && data.success) {
document.getElementById('duplicate-dialog').close();
location.reload();
} else {
alert("Error adding user: " + (data && data.message ? data.message : "Unknown error"));
}
})
.catch((error) => {
console.error("Fetch error:", error);
alert("Error adding user: " + error.message);
});
}
function addNewUserRow() { function addNewUserRow() {
document.getElementById('add-user-dialog').showModal(); document.getElementById('add-user-dialog').showModal();
} }
@@ -292,44 +168,33 @@
return; return;
} }
// Construct the data as an object fetch('/add_user', {
const userData = {
username: mac, // Use MAC as username
password: mac, // Use MAC as password
mac_address: mac,
description: description,
vlan_id: vlan_id
};
fetch('/add_user', { // Make sure this URL is correct
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', // Set the content type to JSON 'Content-Type': 'application/json',
}, },
body: JSON.stringify(userData), // Send the data as a JSON string body: JSON.stringify({ mac_address: mac, description: description, vlan_id: vlan_id }),
}) })
.then(response => { .then(response => {
if (!response.ok) { if (!response.ok) {
// Handle HTTP errors (e.g., 400, 500) return response.text().then(text => {
return response.text().then(text => { throw new Error(`HTTP error! status: ${response.status}, body: ${text}`);
throw new Error(`HTTP error! status: ${response.status}, body: ${text}`); });
}); }
} return response.json();
return response.json(); // Expect JSON response from server })
}) .then(data => {
.then(data => { if (data && data.success) {
console.log("Server response:", data); document.getElementById('add-user-dialog').close();
if (data && data.success) { // Check for success property in JSON response location.reload();
document.getElementById('add-user-dialog').close(); } else {
location.reload(); alert('Error adding user: ' + (data && data.message ? data.message : 'Unknown error'));
} else { }
alert('Error adding user: ' + (data && data.message ? data.message : 'Unknown error')); // Show error from server or a generic message })
} .catch(error => {
}) console.error('Fetch error:', error);
.catch(error => { alert('Error adding user: ' + error.message);
console.error('Fetch error:', error); // Log the error for debugging });
alert('Error adding user: ' + error.message); // Show a user-friendly error message
});
} }
</script> </script>
{% endblock %} {% endblock %}