Backup_Repos/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash synced 2025-12-06 08:22:24 +01:00
Code Issues Projects Releases Wiki Activity

feature (default root): the default path set what a user can see as root folder #29

Browse source
This commit is contained in:
Mickael KERJEAN 2018-04-09 18:31:59 +10:00
parent 8d9b554e79
commit e5ce3fb7ea
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/pages/connectpage.js
View file

@ -48,8 +48,7 @@ export class ConnectPage extends React.Component {
Session.authenticate(params)
.then((ok) => {
cache.destroy();
const path = params.path && /^\//.test(params.path)? /\/$/.test(params.path) ? params.path : params.path+'/' : '/';
this.props.history.push('/files'+path);
this.props.history.push('/files/');
})
.catch((err) => {
this.setState({loading: false});

17
server/ctrl/files.js
View file

@ -1,5 +1,6 @@
var express = require('express'),
app = express.Router(),
path = require('path'),
crypto = require('../utils/crypto'),
Files = require('../model/files'),
multiparty = require('multiparty'),
@ -17,7 +18,7 @@ app.use(function(req, res, next){
// list files
app.get('/ls', function(req, res){
let path = decodeURIComponent(req.query.path);
let path = pathBuilder(req);
if(path){
Files
.ls(path, req.cookies.auth)
@ -34,7 +35,7 @@ app.get('/ls', function(req, res){
// get a file content
app.get('/cat', function(req, res){
let path = decodeURIComponent(req.query.path);
let path = pathBuilder(req);
res.cookie('download', path, { maxAge: 1000 });
if(path){
Files.cat(path, req.cookies.auth, res)
@ -54,7 +55,7 @@ app.get('/cat', function(req, res){
// https://github.com/pillarjs/multiparty
app.post('/cat', function(req, res){
var form = new multiparty.Form(),
path = decodeURIComponent(req.query.path);
path = pathBuilder(req);
if(path){
form.on('part', function(part) {
@ -98,7 +99,7 @@ app.get('/mv', function(req, res){
// delete a file/directory
app.get('/rm', function(req, res){
let path = decodeURIComponent(req.query.path);
let path = pathBuilder(req);
if(path){
Files.rm(path, req.cookies.auth)
.then((message) => {
@ -114,7 +115,7 @@ app.get('/rm', function(req, res){
// create a directory
app.get('/mkdir', function(req, res){
let path = decodeURIComponent(req.query.path);
let path = pathBuilder(req);
if(path){
Files.mkdir(path, req.cookies.auth)
.then((message) => {
@ -129,7 +130,7 @@ app.get('/mkdir', function(req, res){
});
app.get('/touch', function(req, res){
let path = decodeURIComponent(req.query.path);
let path = pathBuilder(req);
if(path){
Files.touch(path, req.cookies.auth)
.then((message) => {
@ -145,3 +146,7 @@ app.get('/touch', function(req, res){
module.exports = app;
function pathBuilder(req){
return path.join(req.cookies.auth.payload.path, decodeURIComponent(req.query.path));
}

8
server/ctrl/session.js
View file

@ -13,9 +13,11 @@ app.get('/', function(req, res){
}
});
app.post('/', function(req, res){
app.post('/', function(req, res){
Session.test(req.body)
.then((state) => {
if(!state.path) state.path = "";
else{ state.path = state.path.replace(/\/$/, ''); }
let persist = {
type: req.body.type,
payload: state
@ -25,7 +27,7 @@ app.post('/', function(req, res){
res.send({status: 'error', message: 'we can\'t authenticate you', })
}else{
res.cookie('auth', crypto.encrypt(persist), { maxAge: 365*24*60*60*1000, httpOnly: true });
res.send({status: 'ok', result: 'pong'});
res.send({status: 'ok'});
}
})
.catch((err) => {
@ -35,7 +37,7 @@ app.post('/', function(req, res){
t += ' ('+err.code+')';
}
return t;
}
}
res.send({status: 'error', message: message(err), code: err.code});
});
});