fix "user undefined"
This commit is contained in:
parent
eecd89ac49
commit
0dd814b33e
|
@ -54,6 +54,10 @@ def get_pubkey(id, check_user=True):
|
||||||
@bp.route('/create', methods=('GET', 'POST'))
|
@bp.route('/create', methods=('GET', 'POST'))
|
||||||
@login_required
|
@login_required
|
||||||
def create():
|
def create():
|
||||||
|
db = get_db()
|
||||||
|
user = db.execute(
|
||||||
|
'SELECT * FROM user WHERE id = ?', (g.user['id'],)
|
||||||
|
).fetchone()
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
key_name = request.form['key_name']
|
key_name = request.form['key_name']
|
||||||
ssh_pubkey = request.form['ssh_pubkey']
|
ssh_pubkey = request.form['ssh_pubkey']
|
||||||
|
@ -64,11 +68,11 @@ def create():
|
||||||
fingerprint = str(base64.b64encode(hashlib.sha256(base64.b64decode(key)).digest()), "utf-8").rstrip('=')
|
fingerprint = str(base64.b64encode(hashlib.sha256(base64.b64decode(key)).digest()), "utf-8").rstrip('=')
|
||||||
print(fingerprint)
|
print(fingerprint)
|
||||||
|
|
||||||
db = get_db()
|
|
||||||
ckfp = db.execute(
|
ckfp = db.execute(
|
||||||
'SELECT id, fingerprint, deleted FROM pubkeys WHERE fingerprint = ?', (fingerprint, )
|
'SELECT id, fingerprint, deleted FROM pubkeys WHERE fingerprint = ?', (fingerprint, )
|
||||||
).fetchone()
|
).fetchone()
|
||||||
|
|
||||||
|
|
||||||
if ckfp != None:
|
if ckfp != None:
|
||||||
if ckfp['fingerprint'] == fingerprint:
|
if ckfp['fingerprint'] == fingerprint:
|
||||||
if ckfp['deleted'] == 0:
|
if ckfp['deleted'] == 0:
|
||||||
|
@ -96,13 +100,17 @@ def create():
|
||||||
db.commit()
|
db.commit()
|
||||||
return redirect(url_for('pubkeys.index'))
|
return redirect(url_for('pubkeys.index'))
|
||||||
|
|
||||||
return render_template('pubkeys/create.html')
|
return render_template('pubkeys/create.html', user=user)
|
||||||
|
|
||||||
@bp.route('/<int:id>/update', methods=('GET', 'POST'))
|
@bp.route('/<int:id>/update', methods=('GET', 'POST'))
|
||||||
@login_required
|
@login_required
|
||||||
def update(id):
|
def update(id):
|
||||||
pubkey = get_pubkey(id)
|
pubkey = get_pubkey(id)
|
||||||
|
|
||||||
|
db = get_db()
|
||||||
|
user = db.execute(
|
||||||
|
'SELECT * FROM user WHERE id = ?', (g.user['id'],)
|
||||||
|
).fetchone()
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
key_name = request.form['key_name']
|
key_name = request.form['key_name']
|
||||||
deleted = request.form.get('deleted')
|
deleted = request.form.get('deleted')
|
||||||
|
@ -118,7 +126,6 @@ def update(id):
|
||||||
if error is not None:
|
if error is not None:
|
||||||
flash(error)
|
flash(error)
|
||||||
else:
|
else:
|
||||||
db = get_db()
|
|
||||||
db.execute(
|
db.execute(
|
||||||
'UPDATE pubkeys SET key_name = ?, deleted = ?'
|
'UPDATE pubkeys SET key_name = ?, deleted = ?'
|
||||||
' WHERE id = ?',
|
' WHERE id = ?',
|
||||||
|
@ -127,7 +134,7 @@ def update(id):
|
||||||
db.commit()
|
db.commit()
|
||||||
return redirect(url_for('pubkeys.index'))
|
return redirect(url_for('pubkeys.index'))
|
||||||
|
|
||||||
return render_template('pubkeys/update.html', pubkey=pubkey)
|
return render_template('pubkeys/update.html', pubkey=pubkey, user=user)
|
||||||
|
|
||||||
@bp.route('/<int:id>/delete', methods=('GET',))
|
@bp.route('/<int:id>/delete', methods=('GET',))
|
||||||
@login_required
|
@login_required
|
||||||
|
|
|
@ -29,3 +29,4 @@ nav ul li a, nav ul li span, header .action { display: block; padding: 0.5rem; }
|
||||||
.danger { color: #cc2f2e; }
|
.danger { color: #cc2f2e; }
|
||||||
input.danger { color: #cc2f2e; }
|
input.danger { color: #cc2f2e; }
|
||||||
input[type=submit] { align-self: start; min-width: 10em; }
|
input[type=submit] { align-self: start; min-width: 10em; }
|
||||||
|
.key { color: #cc22ff; }
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<div name="fingerprint" id="fingerprint">fingerprint: {{ pubkey['fingerprint'] }}</div>
|
<div name="fingerprint" id="fingerprint">fingerprint: {{ pubkey['fingerprint'] }}</div>
|
||||||
<br>
|
<br>
|
||||||
<div name="ssh_pubkey" id="ssh_pubkey">{{ request.form['ssh_pubkey'] or pubkey['ssh_pubkey'] }}</div>
|
<div class="key" name="ssh_pubkey" id="ssh_pubkey">{{ request.form['ssh_pubkey'] or pubkey['ssh_pubkey'] }}</div>
|
||||||
<p class="about">registered on {{ pubkey['created'].strftime('%Y-%m-%d') }}</p>
|
<p class="about">registered on {{ pubkey['created'].strftime('%Y-%m-%d') }}</p>
|
||||||
</form>
|
</form>
|
||||||
<!--form action="{{ url_for('pubkeys.revoke', id=pubkey['id']) }}" method="POST">
|
<!--form action="{{ url_for('pubkeys.revoke', id=pubkey['id']) }}" method="POST">
|
||||||
|
|
Loading…
Reference in a new issue