X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.js;h=dd7d7cba8c2c898b8e87dc68259ccb2a2acc820e;hb=83544c5c8685db63b98d8035b99c501afe509776;hp=cc644e6b3a90791109cffae9b4a5078231dc0e18;hpb=4d8f08f9c825c35ed3e05ce92457c2fc2e2194c6;p=perso%2FImmae%2FProjets%2FNodejs%2FSurfer.git

diff --git a/server.js b/server.js
index cc644e6..dd7d7cb 100755
--- a/server.js
+++ b/server.js
@@ -2,10 +2,8 @@
 
 'use strict';
 
-
 var express = require('express'),
     morgan = require('morgan'),
-    passport = require('passport'),
     path = require('path'),
     fs = require('fs'),
     compression = require('compression'),
@@ -18,7 +16,7 @@ var express = require('express'),
     multipart = require('./src/multipart'),
     mkdirp = require('mkdirp'),
     auth = require('./src/auth.js'),
-    serveIndex = require('serve-index'),
+    webdav = require('webdav-server').v2,
     files = require('./src/files.js')(path.resolve(__dirname, process.argv[2] || 'files'));
 
 
@@ -50,7 +48,7 @@ function setSettings(req, res, next) {
 
 // Load the config file
 try {
-    console.log(`Using config file: ${CONFIG_FILE}`);
+    console.log(`Using config file at: ${CONFIG_FILE}`);
     config = require(CONFIG_FILE);
 } catch (e) {
     if (e.code === 'MODULE_NOT_FOUND') console.log(`Config file ${CONFIG_FILE} not found`);
@@ -63,45 +61,61 @@ if (typeof config.folderListingEnabled === 'undefined') config.folderListingEnab
 var app = express();
 var router = new express.Router();
 
+var webdavServer = new webdav.WebDAVServer({
+    requireAuthentification: true,
+    httpAuthentication: new webdav.HTTPBasicAuthentication(new auth.WebdavUserManager(), 'Cloudron Surfer')
+});
+
+webdavServer.setFileSystem('/', new webdav.PhysicalFileSystem(ROOT_FOLDER), function (success) {
+    if (success) console.log(`Mounting webdav resource from: ${ROOT_FOLDER}`);
+});
+
 var multipart = multipart({ maxFieldsSize: 2 * 1024, limit: '512mb', timeout: 3 * 60 * 1000 });
 
 router.post  ('/api/login', auth.login);
 router.post  ('/api/logout', auth.verify, auth.logout);
 router.get   ('/api/settings', auth.verify, getSettings);
 router.put   ('/api/settings', auth.verify, setSettings);
+router.get   ('/api/tokens', auth.verify, auth.getTokens);
+router.post  ('/api/tokens', auth.verify, auth.createToken);
+router.delete('/api/tokens/:token', auth.verify, auth.delToken);
 router.get   ('/api/profile', auth.verify, auth.getProfile);
-router.get   ('/api/files/*', auth.verify, files.get);
+router.get   ('/api/files/*', auth.verifyIfNeeded, files.get);
 router.post  ('/api/files/*', auth.verify, multipart, files.post);
 router.put   ('/api/files/*', auth.verify, files.put);
 router.delete('/api/files/*', auth.verify, files.del);
-router.get   ('/api/healthcheck', function (req, res) { res.status(200).send(); });
 
+app.use('/api/healthcheck', function (req, res) { res.status(200).send(); });
 app.use(morgan('dev'));
 app.use(compression());
 app.use('/api', bodyParser.json());
 app.use('/api', bodyParser.urlencoded({ extended: false, limit: '100mb' }));
 app.use('/api', cookieParser());
 app.use('/api', session({ secret: 'surfin surfin', resave: false, saveUninitialized: false }));
-app.use('/api', passport.initialize());
-app.use('/api', passport.session());
 app.use(router);
+app.use(webdav.extensions.express('/_webdav', webdavServer));
 app.use('/_admin', express.static(__dirname + '/frontend'));
 app.use('/', express.static(ROOT_FOLDER));
 app.use('/', function welcomePage(req, res, next) {
     if (config.folderListingEnabled || req.path !== '/') return next();
     res.status(200).sendFile(path.join(__dirname, '/frontend/welcome.html'));
 });
-app.use('/', function (req, res, next) {
-    if (config.folderListingEnabled) return next();
-    res.status(404).sendFile(__dirname + '/frontend/404.html');
+app.use('/', function (req, res) {
+    if (!config.folderListingEnabled) return res.status(404).sendFile(__dirname + '/frontend/404.html');
+
+    if (!fs.existsSync(path.join(ROOT_FOLDER, req.path))) return res.status(404).sendFile(__dirname + '/frontend/404.html');
+
+    res.status(200).sendFile(__dirname + '/frontend/public.html');
 });
-app.use('/', serveIndex(ROOT_FOLDER, { icons: true }));
 app.use(lastMile());
 
 var server = app.listen(3000, function () {
     var host = server.address().address;
     var port = server.address().port;
 
-    console.log('Surfer listening on http://%s:%s', host, port);
-    console.log('Using base path', ROOT_FOLDER);
+    console.log(`Base path: ${ROOT_FOLDER}`);
+    console.log();
+    console.log(`Listening on http://${host}:${port}`);
+
+    auth.init(config);
 });