Compare commits
3 Commits
master
...
feature-ch
Author | SHA1 | Date |
---|---|---|
|
63bb83d36a | |
|
9011ac93b7 | |
|
3aef0da7a0 |
|
@ -21,6 +21,7 @@
|
|||
"release:archive": "zip -rq release.zip package.json package-lock.json node_modules/ *.js src/ config/ locales/"
|
||||
},
|
||||
"dependencies": {
|
||||
"chroot": "1.0.10",
|
||||
"co-body": "6.0.0",
|
||||
"config": "3.2.2",
|
||||
"koa": "2.7.0",
|
||||
|
|
13
src/index.js
13
src/index.js
|
@ -20,12 +20,23 @@
|
|||
const log = require('winston');
|
||||
const config = require('config');
|
||||
const init = require('./app');
|
||||
const chroot = require('chroot');
|
||||
|
||||
(async () => {
|
||||
try {
|
||||
const app = await init();
|
||||
app.listen(config.server.port, "localhost");
|
||||
log.info('app', `Listening on http://localhost:${config.server.port}`);
|
||||
log.info('app', `Listening on http://localhost:${config.server.port}`, function(err) {
|
||||
if (err) { throw err; }
|
||||
|
||||
try {
|
||||
chroot('/var/empty', 'test');
|
||||
console.log('changed root to "/var/empty" and user to "test"');
|
||||
} catch(err) {
|
||||
console.error('changing root or user failed', err);
|
||||
process.exit(1);
|
||||
}
|
||||
});
|
||||
} catch (err) {
|
||||
log.error('app', 'Initialization failed!', err);
|
||||
}
|
||||
|
|
|
@ -136,9 +136,7 @@ class HKP {
|
|||
ctx.body = `info:${VERSION}:${COUNT}\npub:${fp}:${algo}:${key.keySize}:${created}::\n`;
|
||||
|
||||
for (const uid of key.userIds) {
|
||||
if(uid.verified) {
|
||||
ctx.body += `uid:${encodeURIComponent(`${uid.name} <${uid.email}>`)}:::\n`;
|
||||
}
|
||||
ctx.body += `uid:${encodeURIComponent(`${uid.name} <${uid.email}>`)}:::\n`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,35 +0,0 @@
|
|||
/* eslint-disable */
|
||||
|
||||
;(function($) {
|
||||
'use strict';
|
||||
|
||||
$('#copy-button').tooltip({
|
||||
trigger: 'manual',
|
||||
placement: 'right',
|
||||
});
|
||||
|
||||
function setTooltip(message) {
|
||||
$('#copy-button').attr('data-original-title', message)
|
||||
.tooltip('show');
|
||||
}
|
||||
|
||||
function hideTooltip() {
|
||||
setTimeout(function() {
|
||||
$('#copy-button').tooltip('hide');
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
$('#copy-button').click(function(e) {
|
||||
const copyText = $('#publickey-block').text();
|
||||
const textArea = document.createElement('textarea');
|
||||
textArea.textContent = copyText;
|
||||
document.body.append(textArea);
|
||||
textArea.select();
|
||||
document.execCommand("copy");
|
||||
textArea.remove();
|
||||
|
||||
setTooltip('Key copied to clipboard!');
|
||||
hideTooltip();
|
||||
});
|
||||
|
||||
}(jQuery));
|
|
@ -49,54 +49,5 @@
|
|||
$('#' + region + ' .alert-' + outcome + ' span').text(text);
|
||||
$('#' + region + ' .alert-' + outcome).removeClass('hidden');
|
||||
}
|
||||
|
||||
$('#drop_zone').on('drop',
|
||||
function(ev) {
|
||||
// Prevent default behavior (Prevent file from being opened)
|
||||
ev.stopPropagation();
|
||||
ev.preventDefault();
|
||||
$('#addKey .alert').addClass('hidden');
|
||||
if(ev.originalEvent.dataTransfer.files[0].type != "text/plain") {
|
||||
alert('addKey', 'danger', 'You must import an ascii-armored key file!');
|
||||
return;
|
||||
}
|
||||
handleFiles(ev.originalEvent.dataTransfer.files);
|
||||
});
|
||||
$('#drop_zone').on('dragover',
|
||||
function(ev) {
|
||||
// Prevent default behavior (Prevent file from being opened)
|
||||
ev.stopPropagation();
|
||||
ev.preventDefault();
|
||||
ev.originalEvent.dataTransfer.dropEffect = 'copy';
|
||||
});
|
||||
$('#drop_zone').on('dragenter',
|
||||
function(ev) {
|
||||
// Prevent default behavior (Prevent file from being opened)
|
||||
ev.stopPropagation();
|
||||
ev.preventDefault();
|
||||
ev.originalEvent.dataTransfer.dropEffect = 'copy';
|
||||
});
|
||||
|
||||
$('#fileSelect').click(function() {
|
||||
$('#file-selector').click();
|
||||
});
|
||||
|
||||
$('#file-selector').change(function() {
|
||||
$('#addKey .alert').addClass('hidden');
|
||||
handleFiles(this.files);
|
||||
});
|
||||
|
||||
function handleFiles(files) {
|
||||
if(files.length > 1) {
|
||||
alert('addKey', 'danger', 'You must import a single file!');
|
||||
return;
|
||||
}
|
||||
const file = files[0];
|
||||
const reader = new FileReader();
|
||||
reader.onload = function(){
|
||||
$('#addKey textarea').val(reader.result);
|
||||
}
|
||||
reader.readAsText(file);
|
||||
}
|
||||
|
||||
}(jQuery));
|
||||
}(jQuery));
|
|
@ -1,13 +1,3 @@
|
|||
<style type="text/css">
|
||||
|
||||
textarea {
|
||||
position: absolute;
|
||||
left: -100%;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="header clearfix">
|
||||
|
@ -24,14 +14,10 @@
|
|||
<div class="row marketing">
|
||||
<div class="col-lg-12">
|
||||
<h4><%= query.email ? `Email: ${query.email}` : query.fingerprint ? `Fingerprint: ${query.fingerprint}` : `Key ID: ${query.keyId}` %></h4>
|
||||
<button id="copy-button" class="btn btn-primary">Copy key to clipboard</button>
|
||||
<pre id="publickey-block"><%= key.publicKeyArmored %></pre>
|
||||
<pre><%= key.publicKeyArmored %></pre>
|
||||
</div> <!-- /col-lg-12 -->
|
||||
</div>
|
||||
|
||||
<%- include('footer') %>
|
||||
|
||||
</div> <!-- /container -->
|
||||
<script src="/js/jquery.min.js"></script>
|
||||
<script src="/js/bootstrap-3.4.1.min.js"></script>
|
||||
<script src="/js/key-armored.js"></script>
|
||||
|
|
|
@ -24,9 +24,7 @@
|
|||
<div class="progress-bar progress-bar-striped active" role="progressbar"></div>
|
||||
</div>
|
||||
<form action="/pks/add" method="post">
|
||||
<p><textarea id="drop_zone" class="form-control ui-droppable" name="keytext" rows="5" spellcheck="false" placeholder="Drag a single ascii-armored key file here or paste PGP PUBLIC KEY BLOCK here ..." required></textarea></p>
|
||||
<input type="file" id="file-selector" accept="text/plain" style="display:none">
|
||||
<p>Or <button type="button" id="fileSelect">select a file</button> </p>
|
||||
<p><textarea class="form-control" name="keytext" rows="5" spellcheck="false" placeholder="Paste PGP PUBLIC KEY BLOCK here ..." required></textarea></p>
|
||||
<input class="btn btn-primary btn-lg" type="submit" value="Upload">
|
||||
</form>
|
||||
<hr>
|
||||
|
|
Loading…
Reference in New Issue