depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into frontend-next

Browse source
This commit is contained in:
Yukai Huang 2017-01-21 12:08:52 +08:00
commit 4bbe035beb
8 changed files with 95 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app.js
View file

@ -626,8 +626,8 @@ process.on('uncaughtException', function (err) {
process.exit(1);
});
// gracefully exit
process.on('SIGINT', function () {
// install exit handler
function handleTermSignals() {
config.maintenance = true;
// disconnect all socket.io clients
Object.keys(io.sockets.sockets).forEach(function (key) {
@ -649,4 +649,6 @@ process.on('SIGINT', function () {
});
}
}, 100);
});
}
process.on('SIGINT', handleTermSignals);
process.on('SIGTERM', handleTermSignals);

32
lib/realtime.js
View file

@ -363,6 +363,22 @@ function interruptConnection(socket, note, user) {
connectNextSocket();
}
function checkViewPermission(req, note) {
if (note.permission == 'private') {
if (req.user && req.user.logged_in && req.user.id == note.owner)
return true;
else
return false;
} else if (note.permission == 'limited' || note.permission == 'protected') {
if(req.user && req.user.logged_in)
return true;
else
return false;
} else {
return true;
}
}
var isConnectionBusy = false;
var connectionSocketQueue = [];
var isDisconnectBusy = false;
@ -373,15 +389,11 @@ function finishConnection(socket, note, user) {
if (!socket || !note || !user) {
return interruptConnection(socket, note, user);
}
//check view permission
if (note.permission == 'limited' || note.permission == 'protected' || note.permission == 'private') {
if (socket.request.user && socket.request.user.logged_in && socket.request.user.id == note.owner) {
//na
} else {
// check view permission
if (!checkViewPermission(socket.request, note)) {
interruptConnection(socket, note, user);
return failConnection(403, 'connection forbidden', socket);
}
}
// update user color to author color
if (note.authors[user.userid]) {
user.color = users[socket.id].color = note.authors[user.userid].color;
@ -789,11 +801,8 @@ function connection(socket) {
for (var i = 0, l = note.socks.length; i < l; i++) {
var sock = note.socks[i];
if (typeof sock !== 'undefined' && sock) {
//check view permission
if (permission == 'limited' || permission == 'protected' || permission == 'private') {
if (sock.request.user && sock.request.user.logged_in && sock.request.user.id == note.owner) {
//na
} else {
// check view permission
if (!checkViewPermission(sock.request, note)) {
sock.emit('info', {
code: 403
});
@ -803,7 +812,6 @@ function connection(socket) {
}
}
}
}
}).catch(function (err) {
return logger.error('update note permission failed: ' + err);
});

7
lib/response.js
View file

@ -97,7 +97,8 @@ function responseHackMD(res, note) {
dropbox: config.dropbox,
google: config.google,
ldap: config.ldap,
email: config.email
email: config.email,
allowemailregister: config.allowemailregister
});
}
@ -126,9 +127,9 @@ function checkViewPermission(req, note) {
else
return true;
} else if (note.permission == 'limited' || note.permission == 'protected') {
if( !req.isAuthenticated() ) {
if(!req.isAuthenticated())
return false;
}
else
return true;
} else {
return true;

22
public/css/cover.css
View file

@ -78,6 +78,13 @@ body {
margin-top: 10px;
margin-bottom: 10px;
}
.masthead-nav {
text-align: left;
max-width: 1000px;
margin: 0 auto;
padding-left: 10px;
padding-right: 10px;
}
.masthead-nav > li {
display: inline-block;
}
@ -263,9 +270,14 @@ input {
text-decoration: underline;
}
.ui-avatar {
border-radius: 15em;
height: auto;
width: 60px;
display: inline-block;
overflow: hidden;
line-height: 1;
vertical-align: middle;
border-radius: 3px;
}
.ui-avatar.circle {
border-radius: 50%;
}
.ui-history-close {
position: absolute;
@ -338,6 +350,10 @@ input {
display: inline-block !important;
}
.btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active {
color: white;
}
select {
color: black;
}

10
public/js/cover.js
View file

@ -102,7 +102,12 @@ $(".masthead-nav li").click(function () {
$(this).addClass("active");
});
$(".ui-home").click(() => {
// prevent empty link change hash
$('a[href="#"]').click(function (e) {
e.preventDefault();
});
$(".ui-home").click(function (e) {
if (!$("#home").is(':visible')) {
$(".section:visible").hide();
$("#home").fadeIn();
@ -366,7 +371,7 @@ $(".ui-refresh-history").click(() => {
$('.search').val('');
historyList.search();
$('#history-list').slideUp('fast');
$('.pagination').slideUp('fast');
$('.pagination').hide();
resetCheckAuth();
historyList.clear();
@ -378,7 +383,6 @@ $(".ui-refresh-history").click(() => {
$('.search').val(lastKeyword);
checkHistoryList();
$('#history-list').slideDown('fast');
$('.pagination').slideDown('fast');
});
});

4
public/js/index.js
View file

@ -1761,6 +1761,10 @@ ui.toolbar.uploadImage.bind('change', function (e) {
ui.toc.dropdown.click(function (e) {
e.stopPropagation();
});
// prevent empty link change hash
$('a[href="#"]').click(function (e) {
e.preventDefault();
});
//modal actions
var revisions = [];

9
public/js/lib/common/login.js
View file

@ -4,7 +4,7 @@ let checkAuth = false;
let profile = null;
let lastLoginState = getLoginState();
let lastUserId = getUserId();
let loginStateChangeEvent = null;
var loginStateChangeEvent = null;
export function setloginStateChangeEvent(func) {
loginStateChangeEvent = func;
@ -32,9 +32,7 @@ export function setLoginState(bool, id) {
export function checkLoginStateChanged() {
if (getLoginState() != lastLoginState || getUserId() != lastUserId) {
if (loginStateChangeEvent) {
loginStateChangeEvent();
}
if (loginStateChangeEvent) setTimeout(loginStateChangeEvent, 100);
return true;
} else {
return false;
@ -56,8 +54,7 @@ export function clearLoginState() {
export function checkIfAuth(yesCallback, noCallback) {
const cookieLoginState = getLoginState();
if (checkLoginStateChanged())
checkAuth = false;
if (checkLoginStateChanged()) checkAuth = false;
if (!checkAuth || typeof cookieLoginState == 'undefined') {
$.get(`${serverurl}/me`)
.done(data => {

44
public/views/index.ejs
View file

@ -41,6 +41,25 @@
</li>
<li class="ui-history<% if(signin) { %> active<% } %>"><a href="#"><%= __('History') %></a>
</li>
<div class="ui-signin" style="float: right; margin-top: 8px;<% if(signin) { %> display: none;<% } %>">
<% if(allowAnonymous) { %>
<a type="button" href="<%- url %>/new" class="btn btn-sm btn-link"><i class="fa fa-plus"></i> <%= __('New guest note') %></a>
<% } %>
<% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
<button class="btn btn-sm btn-success ui-signin" data-toggle="modal" data-target=".signin-modal"><%= __('Sign In') %></button>
<% } %>
</div>
<div class="ui-signout" style="float: right; margin-top: 8px;<% if(!signin) { %> display: none;<% } %>">
<a type="button" href="<%- url %>/new" class="btn btn-sm btn-link"><i class="fa fa-plus"></i> <%= __('New note') %></a>
<span class="ui-profile dropdown pull-right">
<button id="profileLabel" class="btn btn-sm btn-link ui-profile-label" style="padding-right: 0;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img class="ui-avatar" width="20" height="20"><span class="hidden-xs hidden-sm">&ensp;<span class="ui-name"></span></span>&ensp;<i class="fa fa-caret-down"></i>
</button>
<ul class="dropdown-menu" aria-labelledby="profileLabel">
<li><a href="<%- url %>/logout"><i class="fa fa-sign-out fa-fw"></i> <%= __('Sign Out') %></a></li>
</ul>
</span>
</div>
</ul>
</nav>
</div>
@ -61,19 +80,15 @@
<% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
<span class="ui-signin">
<br>
<a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="min-width: 170px;"><%= __('Sign In') %></a>
<a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="min-width: 200px;"><%= __('Sign In') %></a>
</span>
<% }%>
<% if((facebook || twitter || github || gitlab || dropbox || google || email) && allowAnonymous) { %>
<span class="ui-or"><%= __('or') %></span>
<% }%>
<% if(allowAnonymous) { %>
<% } %>
<span class="ui-signin">
<a href="<%- url %>/new" class="btn btn-lg btn-default" style="min-width: 170px;"><%= __('New guest note') %></a>
<a type="button" href="<%- url %>/features" class="btn btn-lg btn-primary" style="min-width: 200px;"><%= __('Explore all features') %></a>
<br>
<br>
</span>
<% }%>
<div class="lead row" style="width: 90%; margin: 0 auto;">
<div class="col-md-4 inner">
<a href="<%- url %>/features#share-notes">
@ -98,21 +113,10 @@
</div>
<div id="history" class="section"<% if(!signin) { %> style="display:none;"<% } %>>
<% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
<div class="ui-signin">
<div class="ui-signin"<% if(signin) { %> style="display:none;"<% } %>>
<p><%= __('Below is the history from browser') %></p>
</div>
<div class="ui-signout" style="display:none;">
<img class="ui-avatar">
<h4 class="ui-welcome"><%= __('Welcome!') %> <span class="ui-name"></span></h4>
<a href="<%- url %>/new" class="btn btn-md btn-default"><%= __('New note') %></a> <%= __('or') %>
<a href="#" class="btn btn-danger ui-logout"><%= __('Sign Out') %></a>
</div>
<% }%>
<h4>
<a type="button" href="<%- url %>/features" class="btn btn-primary"><%= __('Explore all features') %></a>
</h4>
<hr>
<br>
<form class="form-inline">
<div class="form-group" style="vertical-align: bottom;">
<input class="form-control ui-use-tags" placeholder="<%= __('Select tags...') %>" />