alban
/
changelog-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: alban:56ce8cb6450656af8dbe7b481cb08372b1931fcd
Branches Tags
alban:master
...
compare: alban:77ccaef87d14ba6d908b13a8a768442b2a59749c
Branches Tags
alban:master

4 Commits
56ce8cb645 ... 77ccaef87d

Author SHA1 Message Date
alban 77ccaef87d [enh] There should be a patch method. Also, DOM events should work... 2020-05-24 23:02:56 +02:00
alban b0c6043741 [enh] The delete action should work 2020-05-23 23:26:51 +02:00
alban 3ce2e4514d [fix] tweaks 2020-05-23 22:06:24 +02:00
alban 5bedb0c2a9 [fix] simplify css 2020-05-23 21:47:49 +02:00
5 changed files with 304 additions and 130 deletions
Show Stats Expand all files Collapse all files

6
dbInit/index.js
View File

@ -6,17 +6,17 @@ const dbInit = {};
const bulkData = [
{ "index" : { "_index" : "changelog" } },
{ "author" : "John Ripper <john@theripper.com",
{ "author" : "John Ripper <john@theripper.com>",
"content":"* machines: Installed the server\n```debootstrap -t foobar```",
"server": "server.example.com",
"created_at":"2020-05-23T09:50:33.397Z"},
{ "index" : { "_index" : "changelog" } },
{ "author" : "John Ripper <john@theripper.com",
{ "author" : "John Ripper <john@theripper.com>",
"content":"* db: Installed mysql\n```apt install mariadb-server```",
"server": "server.example.com",
"created_at":"2020-05-23T10:50:33.397Z"},
{ "index" : { "_index" : "changelog" } },
{ "author" : "John Ripper <john@theripper.com",
{ "author" : "John Ripper <john@theripper.com>",
"content":"* nginx: add package\n```apt install nginx-full```",
"server": "server.example.com",
"created_at":"2020-05-23T16:50:33.397Z"}

10
index.js
View File

@ -29,8 +29,6 @@ dbInit.init({
seed : process.env.DB_SEED
});
console.log( "exit")
const express = require('express');
const app = express();
@ -40,6 +38,7 @@ app.use(express.static('public'));
const bodyParser = require('body-parser');
app.use(bodyParser.json());
app.use(bodyParser.raw());
app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.text({ type : "text/*" }));
app.disable('x-powered-by');
@ -64,14 +63,15 @@ function requireAuthentication( req, res, next ){
app.all('*', requireAuthentication);
const routes = require( "./routes");
app.get('/get/:id', routes.get);
app.get('/log/:id', routes.log);
app.get('/health', routes.health);
app.get('/search', routes.search);
app.post('/*', routes.add);
app.get('/*', routes.main);
app.patch('/*', routes.main);
app.post('/*', routes.add);
app.patch('/patch/:id', routes.patch);
app.put('/*', routes.main);
app.delete('/*', routes.main);
app.delete('/delete/:id', routes.delete);
app.listen(port, () => {

60
public/css/site.css
View File

@ -5,45 +5,49 @@
*/
.log {
margin-bottom: 10px;
border-top: 1px solid #eee;
padding-top: 6px;
}
.log p {
color: #666;
}
.log span.cmd {
background: #eee;
color: #003e80;
padding: 3px 8px;
}
.log pre {
font-size: 1.0rem;
color: #333;
padding: 16px 0;
border-top: 1px solid #eee;
}
.log .meta a {
color: #666;
.log .meta {
font-size: .875rem;
color: #888;
line-height:1.2em;
text-align: right;
}
.log .meta p {
font-size: .875rem;
line-height:1em;
margin: 0px;
overflow: hidden;
text-overflow: ellipsis;
margin: 0px;
overflow: hidden;
text-overflow: ellipsis;
}
.log .meta p.server {
color:#333;
color: #333;
font-size:1.125rem;
}
.log .meta .actions-toggle {
margin: 0;
padding: 0;
color: #666;
cursor: pointer;
line-height:1em;
margin: 0;
padding: 0;
cursor: pointer;
line-height:1em;
}
.log .meta .actions{
display:none;
}
.log pre {
font-size: 1.125rem;
color: #333;
}
.log pre .cmd {
background: #eee;
color: #333f4d;
padding: 3px 8px;
}
@media (max-width: 991.98px){
.log .meta {
text-align: left;
}

278
public/js/app.js
View File

@ -1,103 +1,195 @@
/* global initData, authorizationToken */
// List of HTML entities for escaping.
var htmlEscapes = {
'&': '&amp;',
'<': '&lt;',
'>': '&gt;',
'"': '&quot;',
"'": '&#x27;',
'/': '&#x2F;'
};
$(function(){
// Regex containing the keys listed immediately above.
var htmlEscaper = /[&<>"'\/]/g;
const actionToggle = function(e){
var el=e.target;
$(el).parent().siblings('.actions').show();
$(el).hide();
};
// Escape a string for HTML interpolation.
escape = function(string) {
return ('' + string).replace(htmlEscaper, function(match) {
return htmlEscapes[match];
});
};
var urlRegex = /(\S+): (https?:&#x2F;&#x2F;[^\s]+)/g;
url = function(string){
return ''+string.replace(urlRegex, '<a target="_blank" href="$2">$1</a>')
}
var titleRegex = /^(.*\n)/;
title = function(string){
return ''+string.replace(titleRegex, '<b>$1</b>');
}
var cmdRegex = /```([^`]*?)```/g
cmd = function(string) {
return ''+string.replace(cmdRegex, '<span class="cmd">$1</span>');
}
date = function(date){
var D = new Date(date);
return D.toLocaleDateString()+" "+D.toLocaleTimeString();
}
function updatePage(data){
const deleteButton = function(e){
const el = $(e.target);
const url = el.attr('href');
$.ajax(url,{
method: "DELETE",
beforeSend: function(request) {
request.setRequestHeader("authorizationToken", authorizationToken);
}
})
.done(function(data) {
$(el).parents('.log').remove();
})
.fail(function() {
alert( "error" );
});
return false;
};
const editButton = function(e){
const el = $(e.target);
const id = el.attr("rel");
const pre = el.parents(".log").find("pre");
$.ajax(`/get/${id}`,{
beforeSend: function(request) {
request.setRequestHeader("authorizationToken", authorizationToken);
}
})
.done(function(data) {
pre
.text(data._source.content)
.attr('rel',id)
.css("background","#ccc")
.attr("contenteditable",true)
.focus();
$('body pre[contenteditable]').on('focusout', contentEdited );
})
.fail(function(data,err) {
console.log(data,err);
alert( "error" );
});
return false;
};
const contentEdited = function(e) {
const el = $(e.target);
const id = el.attr('rel');
const content = el.text();
$.ajax(`/patch/${id}`,{
method: "PATCH",
data: {content:content},
beforeSend: function(request) {
request.setRequestHeader("authorizationToken", authorizationToken);
}
})
.done(function(data) {
el
.css("background","")
.html( formatContent(content) );
})
.fail(function(data,err) {
console.log(data,err);
alert( "error" );
});
};
var content = "";
var item = {};
var id = '';
// If the log entry is unique, simulate a search result
if( ! data['hits'] ){
data = {hits:{hits:[data]}};
}
$.each(data.hits.hits, (k,v)=>{
item = v._source;
id = v._id;
content += `
const search = function(e){
const el = $(e.target);
const val = el.val();
if( val.length < 3 ){ return; }
$.ajax("/search",{
beforeSend: function(request) {
request.setRequestHeader("authorizationToken", authorizationToken);
},
data: {
q:val
}
})
.done(function(data) {
updatePage(data);
})
.fail(function() {
alert( "error" );
});
};
<div class="log row">
<div class="meta col-lg-2 text-right">
<p class="server"> ${escape(item.server)} </p>
<a href="/log/${id}">
${date(escape(item.created_at))} <br/>
</a>
<div class="d-none d-lg-block">
<p class="author"> ${escape(item.author)} </p>
<p>
<a class="actions-toggle btn-link btn-sm">Actions</a>
</p>
<div class="actions btn-group btn-group-sm" role="group" aria-label="log actions">
<a class="destroy btn btn btn-outline-secondary" href="/destroy/${id}">Remove</a>
<a class="edit btn btn btn-outline-secondary" href="/edit/${id}">Edit</a>
</div>
</div>
</div>
<div class="col-lg">
<pre> ${cmd(title(url(escape(item.content))))}</pre>
</div>
</div>
`;
});
$("#content").html(content);
// List of HTML entities for escaping.
var htmlEscapes = {
'&': '&amp;',
'<': '&lt;',
'>': '&gt;',
'"': '&quot;',
"'": '&#x27;',
'/': '&#x2F;'
};
// Regex containing the keys listed immediately above.
var htmlEscaper = /[&<>"'\/]/g;
// Escape a string for HTML interpolation.
const escape = function(string) {
return ('' + string).replace(htmlEscaper, function(match) {
return htmlEscapes[match];
});
};
const urlRegex = /(\S+): (https?:&#x2F;&#x2F;[^\s]+)/g;
const url = function(string){
return ''+string.replace(urlRegex, '<a target="_blank" href="$2">$1</a>');
};
var titleRegex = /^(.*\n)/;
const title = function(string){
return ''+string.replace(titleRegex, '<b>$1</b>');
};
var cmdRegex = /```([^`]*?)```/g;
const cmd = function(string) {
return ''+string.replace(cmdRegex, '<span class="cmd">$1</span>');
};
const date = function(string){
var D = new Date(string);
return D.toLocaleDateString()+" "+D.toLocaleTimeString();
};
const mailRegexp = /(.*) &lt;(.+@.+)&gt;/;
const mail = function( string ){
return ''+string.replace(mailRegexp, `<a href="mailto:${string}">$1</a>`);
};
}
const formatContent = function(string){
return cmd(title(url(escape(string))));
};
function updatePage(data){
$("input").on("keyup",function(e){
const el = $(e.target);
const val = el.val();
if( val.length < 3 ){ return; }
$.ajax("/search",{
beforeSend: function(request) {
request.setRequestHeader("authorizationToken", authorizationToken);
},
data: {
q:val,
var content = "";
var item = {};
var id = '';
// If the log entry is unique, simulate a search result
if( ! data['hits'] ){
data = {hits:{hits:[data]}};
}
})
.done(function(data) {
updatePage(data);
})
.fail(function() {
alert( "error" );
});
$.each(data.hits.hits, (k,v)=>{
item = v._source;
id = v._id;
content += `
<div class="log row">
<div class="meta col-lg-2 ">
<p class="server"> ${escape(item.server)} </p>
<a href="/log/${id}">
${date(escape(item.created_at))} <br/>
</a>
<div class="d-none d-lg-block">
<p class="author"> ${mail(escape(item.author))} </p>
<p>
<a class="actions-toggle btn-link btn-sm">Actions</a>
</p>
<div class="actions btn-group btn-group-sm" role="group" aria-label="log actions">
<a class="delete btn btn btn-outline-secondary" rel="${id}" href="/delete/${id}">Remove</a>
<a class="edit btn btn btn-outline-secondary" rel="${id}" href="/edit/${id}">Edit</a>
</div>
</div>
</div>
<div class="col-lg data">
<pre> ${formatContent(item.content)}</pre>
</div>
</div>
`;
});
$("#content").html(content);
// attache events
$(".actions-toggle").on("click",actionToggle );
$('.delete').on('click', deleteButton);
$('.edit').on('click', editButton );
}
$("input").on("keyup",search );
updatePage( initData );
});
updatePage( initData );
$(".actions-toggle").on("click",(e) => { var el=e.target; $(el).parent().siblings('.actions').show(); $(el).hide(); } )

80
routes/index.js
View File

@ -54,6 +54,53 @@ const routes = {
res.json({"health":0,"msg":"Lost connection to ES"});
});
},
delete: (req,res) => {
const id= req.params.id;
// Reindex the doc to the "trash" index
var log = client.reindex({
refresh: true,
max_docs: 1,
body: {
source: {
index: 'changelog',
query: {
term: {
_id: id
}
}
},
dest: {
index: 'changelog-trash',
}
}
})
.then( (results, err) => {
console.log(`reindexing success for id ${id}`)
// Remove it from the original index
return client.delete({
index: "changelog",
id: id
});
}, (e) => {
console.log("reindexing error")
res.status(400);
res.end("error");
})
.then( (results, err) => {
console.log(`Delete success for id ${id}`)
res.end("ok");
},(results, err) => {
console.log(`Delete error for id ${id}`)
res.status(400);
res.end("error");
});
},
add: (req, res) => {
const body = req.body;
@ -69,12 +116,43 @@ const routes = {
res.end("error");
});
} ,
get: (req, res) => {
const id= req.params.id;
var log = client.get({
index: 'changelog',
id: id
}).then( (results, err) => {
res.json(results);
}, (e) => {
res.status(400);
res.json({msg:"Failed to get record"});
});
},
patch: (req,res) => {
const id= req.params.id;
const content= req.body.content;
var log = client.update({
index: 'changelog',
id: id,
body:{
doc:{
content:content
}
}
}).then( (results, err) => {
res.json(results);
}, (e) => {
res.status(400);
res.json({msg:"Failed to get record"});
}); },
log: (req, res) => {
const id= req.params.id;
var log = client.get({
index: 'changelog',
id: id
id: id
}).then( (results, err) => {
res.render('index', {
title: 'changelog',