fix(local-process): make content folder check work in more cases

no issue - return true for content folder check if everyone has read & write permissions
TryGhost · Feb 6, 2018 · 710a9d4 · 710a9d4
1 parent d791101
commit 710a9d4
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 7 deletions.
diff --git a/lib/utils/local-process.js b/lib/utils/local-process.js
@@ -184,7 +184,14 @@ Please ensure the content folder has correct permissions and try again.`));
         }
 
         const stat = fs.lstatSync(path.join(cwd, 'content'));
-        return stat.uid === process.getuid();
+
+        if (stat.uid === process.getuid()) {
+            return true;
+        }
+
+        const Mode = require('stat-mode');
+        const mode = new Mode(stat);
+        return mode.others.write && mode.others.read;
     }
 
     /**

diff --git a/test/unit/utils/local-process-spec.js b/test/unit/utils/local-process-spec.js
@@ -329,38 +329,51 @@ describe('Unit: Utils > local-process', function () {
     });
 
     describe('_checkContentFolder', function () {
-        const LocalProcess = require(modulePath);
+        let LocalProcess;
+        let modeStub;
+
+        beforeEach(() => {
+            modeStub = sandbox.stub();
+            LocalProcess = proxyquire(modulePath, {
+                'stat-mode': modeStub
+            });
+        });
 
         it('skips if windows', function () {
             const statStub = sandbox.stub(fs, 'lstatSync');
             const instance = new LocalProcess({}, {
                 platform: {windows: true}
             }, {});
+            modeStub.returns({others: {write: false, read: false}});
 
             const result = instance._checkContentFolder('/var/www/ghost');
 
             expect(result).to.be.true;
             expect(statStub.called).to.be.false;
+            expect(modeStub.called).to.be.false;
         });
 
-        it('returns false if getuid and lstatSync don\'t match', function () {
-            const statStub = sandbox.stub(fs, 'lstatSync').returns({uid: 2});
+        it('returns true if getuid and lstatSync match', function () {
+            const statStub = sandbox.stub(fs, 'lstatSync').returns({uid: 1});
             const uidStub = sandbox.stub(process, 'getuid').returns(1);
+            modeStub.returns({others: {write: false, read: false}});
 
             const instance = new LocalProcess({}, {
                 platform: {linux: true}
             }, {});
             const result = instance._checkContentFolder('/var/www/ghost');
 
-            expect(result).to.be.false;
+            expect(result).to.be.true;
             expect(statStub.calledOnce).to.be.true;
             expect(statStub.calledWithExactly('/var/www/ghost/content')).to.be.true;
             expect(uidStub.calledOnce).to.be.true;
+            expect(modeStub.called).to.be.false;
         });
 
-        it('returns true if getuid and lstatSync match', function () {
-            const statStub = sandbox.stub(fs, 'lstatSync').returns({uid: 1});
+        it('returns true if getuid and lstatSync don\'t match, but current user has read&write permissions', function () {
+            const statStub = sandbox.stub(fs, 'lstatSync').returns({uid: 2});
             const uidStub = sandbox.stub(process, 'getuid').returns(1);
+            modeStub.returns({others: {write: true, read: true}});
 
             const instance = new LocalProcess({}, {
                 platform: {linux: true}
@@ -371,6 +384,24 @@ describe('Unit: Utils > local-process', function () {
             expect(statStub.calledOnce).to.be.true;
             expect(statStub.calledWithExactly('/var/www/ghost/content')).to.be.true;
             expect(uidStub.calledOnce).to.be.true;
+            expect(modeStub.calledOnce).to.be.true;
+        });
+
+        it('returns false if getuid and lstatSync don\'t match, and current user doesn\'t have read&write permissions', function () {
+            const statStub = sandbox.stub(fs, 'lstatSync').returns({uid: 2});
+            const uidStub = sandbox.stub(process, 'getuid').returns(1);
+            modeStub.returns({others: {write: false, read: false}});
+
+            const instance = new LocalProcess({}, {
+                platform: {linux: true}
+            }, {});
+            const result = instance._checkContentFolder('/var/www/ghost');
+
+            expect(result).to.be.false;
+            expect(statStub.calledOnce).to.be.true;
+            expect(statStub.calledWithExactly('/var/www/ghost/content')).to.be.true;
+            expect(uidStub.calledOnce).to.be.true;
+            expect(modeStub.calledOnce).to.be.true;
         });
     });
 });