Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

PUBLIC / surfer-okd

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Files
  • Commits
  • Branches
  • Tags
  • Contributors
  • Graph
  • Compare
  • Charts
Commit b979e487 authored 5 years ago by Johannes Zellner's avatar Johannes Zellner
Browse files
Options
  • Browse Files
  • Download
  • Email Patches
  • Plain Diff

Bump manifest format

1 parent df0c8653
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
  • CHANGELOG
  • CloudronManifest.json
  • DESCRIPTION.md
  • package-lock.json
  • package.json
  • src/auth.js
CHANGELOG
View file @b979e48
......@@ -85,3 +85,5 @@
[5.6.0]
* Add SFTP support
[5.7.0]
* Update to latest app package manifest
This diff is collapsed. Click to expand it.
CloudronManifest.json
View file @b979e48
......@@ -10,10 +10,11 @@
"hosting",
"server"
],
"version": "5.6.0",
"version": "5.7.0",
"healthCheckPath": "/api/healthcheck",
"httpPort": 3000,
"manifestVersion": 1,
"manifestVersion": 2,
"minBoxVersion": "4.1.4",
"website": "https://git.cloudron.io/cloudron/surfer",
"documentationUrl": "https://cloudron.io/documentation/apps/surfer/",
"contactEmail": "support@cloudron.io",
......
This diff is collapsed. Click to expand it.
DESCRIPTION.md
View file @b979e48
This app packages Surfer <upstream>5.5.0</upstream>
This app packages Surfer <upstream>5.7.0</upstream>
### Overview
......
This diff is collapsed. Click to expand it.
package-lock.json
View file @b979e48
{
"name": "cloudron-surfer",
"version": "5.5.0",
"version": "5.7.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
This diff is collapsed. Click to expand it.
package.json
View file @b979e48
{
"name": "cloudron-surfer",
"version": "5.5.0",
"version": "5.7.0",
"description": "Simple file server",
"main": "server.js",
"scripts": {
......
This diff is collapsed. Click to expand it.
src/auth.js
View file @b979e48
......@@ -12,8 +12,8 @@ var passport = require('passport'),
HttpSuccess = require('connect-lastmile').HttpSuccess,
webdavErrors = require('webdav-server').v2.Errors;
const LDAP_URL = process.env.LDAP_URL;
const LDAP_USERS_BASE_DN = process.env.LDAP_USERS_BASE_DN;
const LDAP_URL = process.env.CLOUDRON_LDAP_URL;
const LDAP_USERS_BASE_DN = process.env.CLOUDRON_LDAP_USERS_BASE_DN;
const LOCAL_AUTH_FILE = path.resolve(process.env.LOCAL_AUTH_FILE || './.users.json');
const TOKENSTORE_FILE = path.resolve(process.env.TOKENSTORE_FILE || './.tokens.json');
const AUTH_METHOD = (LDAP_URL && LDAP_USERS_BASE_DN) ? 'ldap' : 'local';
......@@ -79,16 +79,16 @@ passport.deserializeUser(function (id, done) {
function verifyUser(username, password, callback) {
if (AUTH_METHOD === 'ldap') {
var ldapClient = ldapjs.createClient({ url: process.env.LDAP_URL });
var ldapClient = ldapjs.createClient({ url: process.env.CLOUDRON_LDAP_URL });
ldapClient.on('error', function (error) {
console.error('LDAP error', error);
});
ldapClient.bind(process.env.LDAP_BIND_DN, process.env.LDAP_BIND_PASSWORD, function (error) {
ldapClient.bind(process.env.CLOUDRON_LDAP_BIND_DN, process.env.CLOUDRON_LDAP_BIND_PASSWORD, function (error) {
if (error) return callback(error);
var filter = `(|(uid=${username})(mail=${username})(username=${username})(sAMAccountName=${username}))`;
ldapClient.search(process.env.LDAP_USERS_BASE_DN, { filter: filter }, function (error, result) {
ldapClient.search(process.env.CLOUDRON_LDAP_USERS_BASE_DN, { filter: filter }, function (error, result) {
if (error) return callback(error);
var items = [];
......
This diff is collapsed. Click to expand it.
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment