Merge pull request #59 from kirilknysh/fix/open-directory

fix: fs.open on directory as read-only
streamich · Jan 9, 2018 · b90c016 · b90c016
2 parents 53eb588 + 61ce424
commit b90c016
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/__tests__/volume.test.ts b/src/__tests__/volume.test.ts
@@ -277,6 +277,7 @@ describe('volume', () => {
         });
         describe('.open(path, flags[, mode], callback)', () => {
             const vol = new Volume;
+            vol.mkdirSync('/test-dir');
             it('Create new file at root (/test.txt)', done => {
                 vol.open('/test.txt', 'w', (err, fd) => {
                     expect(err).toBe(null);
@@ -338,7 +339,20 @@ describe('volume', () => {
                   expect(vol.root.getChild('b.txt').getNode().canWrite()).toBe(true);
                   done();
               });
-            })
+            });
+            it('Error on incorrect flags for directory', done => {
+                vol.open('/test-dir', 'r+', (err, fd) => {
+                    expect(err.code).toBe('EISDIR');
+                    done();
+                });
+            });
+            it('Properly opens directory as read-only', done => {
+                vol.open('/test-dir', 'r', (err, fd) => {
+                    expect(err).toBe(null);
+                    expect(typeof fd).toBe('number');
+                    done();
+                });
+            });
         });
         describe('.close(fd, callback)', () => {
             const vol = new Volume;

diff --git a/src/volume.ts b/src/volume.ts
@@ -844,7 +844,7 @@ export class Volume {
         if(!realLink) throwError(ENOENT, 'open', link.getPath());
 
         const node = realLink.getNode();
-        if(node.isDirectory())
+        if(node.isDirectory() && (flagsNum !== FLAGS.r))
             throwError(EISDIR, 'open', link.getPath());
 
         // Check node permissions