Merge branch 'master' into flow-type-storage-adapter

Author: flovilmart

.github/ISSUE_TEMPLATE.md

@@ -4,6 +4,8 @@ If you have a non-bug question, ask on Stack Overflow or Server Fault:
 - https://stackoverflow.com/questions/tagged/parse.com 
 - https://serverfault.com/tags/parse
 
+If you have a vulnerability disclosure, please follow our policy available here https://github.com/parse-community/parse-server/blob/master/SECURITY.md
+
 You may also search through existing issues before opening a new one: https://github.com/parse-community/parse-server/issues?utf8=%E2%9C%93&q=is%3Aissue 
 
 --- Please use this template. If you don't use this template, your issue may be closed without comment. ---

.travis.yml

@@ -41,6 +41,8 @@ before_script:
 - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database
 - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database
 - silent=1 mongodb-runner --start
+script:
+- npm run coverage
 after_script:
 - bash <(curl -s https://codecov.io/bash)
 
@@ -52,7 +54,7 @@ jobs:
       env: 
       before_script: skip
       after_script: skip
-      script: npm install -g nsp && nsp check
+      script: skip
       deploy:
         - provider: script
           skip_cleanup: true

CHANGELOG.md

@@ -3,9 +3,18 @@
 ### master
 [Full Changelog](https://github.com/parse-community/parse-server/compare/2.7.0...master)
 
+### 2.7.1
+[Full Changelog](https://github.com/parse-community/parse-server/compare/2.7.1...2.7.0)
+
+:warning: Fixes a security issue affecting Class Level Permissions
+
+* Adds support for dot notation when using matchesKeyInQuery, thanks to [Henrik](https://github.com/bohemima) and [Arthur Cinader](https://github.com/acinader)
+
 ### 2.7.0
 [Full Changelog](https://github.com/parse-community/parse-server/compare/2.7.0...2.6.5)
 
+:warning: This version contains an issue affecting Class Level Permissions on mongoDB. Please upgrade to 2.7.1.
+
 Starting parse-server 2.7.0, the minimun nodejs version is 6.11.4, please update your engines before updating parse-server
 
 #### New Features:

README.md

@@ -337,6 +337,7 @@ You can also use other email adapters contributed by the community such as:
 - [parse-server-sendinblue-adapter](https://www.npmjs.com/package/parse-server-sendinblue-adapter)
 - [parse-server-mailjet-adapter](https://www.npmjs.com/package/parse-server-mailjet-adapter)
 - [simple-parse-smtp-adapter](https://www.npmjs.com/package/simple-parse-smtp-adapter)
+- [parse-server-generic-email-adapter](https://www.npmjs.com/package/parse-server-generic-email-adapter)
 
 ### Using environment variables to configure Parse Server
 

SECURITY.md

@@ -0,0 +1,75 @@
+# Parse Community Vulnerability Disclosure Program
+If you believe you have found a security vulnerability on one of parse-community maintained packages,
+we encourage you to let us know right away. 
+We will investigate all legitimate reports and do our best to quickly fix the problem. 
+Before reporting though, please review this page including and those things that should not be reported.
+
+# Responsible Disclosure Policy
+If you comply with the policies below when reporting a security issue to parse community, 
+we will not initiate a lawsuit or law enforcement investigation against you in response to your report.
+We ask that: 
+
+- You give us reasonable time to investigate and mitigate an issue you report before making public any information about the report or sharing such information with others. This means we request _at least_ **7 days** to get back to you with an initial response and _at least_ **30 days** from initial contact (made by you) to apply a patch.
+- You do not interact with an individual account (which includes modifying or accessing data from the account) if the account owner has not consented to such actions.
+- You make a good faith effort to avoid privacy violations and disruptions to others, including (but not limited to) destruction of data and interruption or degradation of our services.
+- You do not exploit a security issue you discover for any reason. (This includes demonstrating additional risk, such as attempted compromise of sensitive company data or probing for additional issues). You do not violate any other applicable laws or regulations.
+
+# Communicating with us
+
+All vulnerability should be privately reported to either [Node Security](https://nodesecurity.io/report) or directly to us at the following address [security at parseplatform dot org](mailto:[email protected])
+
+You can use our PGP public key, which is also uploaded [here](hkp://pgp.mit.edu):
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=o7Nx
+-----END PGP PUBLIC KEY BLOCK-----
+```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {
@@ -30,10 +30,10 @@
     "intersect": "1.0.1",
     "lodash": "4.17.4",
     "lru-cache": "4.1.1",
-    "mime": "2.0.3",
+    "mime": "2.0.5",
     "mongodb": "2.2.33",
     "multer": "1.3.0",
-    "parse": "1.10.2",
+    "parse": "1.11.0",
     "pg-promise": "7.3.2",
     "redis": "2.8.0",
     "request": "2.83.0",
@@ -42,7 +42,7 @@
     "uuid": "^3.1.0",
     "winston": "2.4.0",
     "winston-daily-rotate-file": "1.7.2",
-    "ws": "3.3.2"
+    "ws": "3.3.3"
   },
   "devDependencies": {
     "babel-cli": "6.26.0",
@@ -52,7 +52,7 @@
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "1.6.1",
     "bcrypt-nodejs": "0.0.3",
-    "cross-env": "5.1.1",
+    "cross-env": "5.1.3",
     "deep-diff": "0.3.8",
     "eslint": "^4.9.0",
     "eslint-plugin-flowtype": "^2.39.1",
@@ -70,10 +70,8 @@
     "lint": "flow && eslint --cache ./",
     "build": "babel src/ -d lib/ --copy-files",
     "pretest": "npm run lint",
-    "test": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 TESTING=1 $COVERAGE_OPTION jasmine",
-    "test:win": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 TESTING=1 jasmine",
-    "coverage": "cross-env COVERAGE_OPTION='./node_modules/.bin/nyc' npm test",
-    "coverage:win": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 TESTING=1 node ./node_modules/.bin/nyc ./node_modules/jasmine/bin/jasmine.js",
+    "test": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 TESTING=1 jasmine",
+    "coverage": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 TESTING=1 nyc jasmine",
     "start": "node ./bin/parse-server",
     "prepublish": "npm run build"
   },

spec/LogsRouter.spec.js

@@ -62,4 +62,93 @@ describe('LogsRouter', () => {
       done();
     });
   });
+
+  const headers = {
+    'X-Parse-Application-Id': 'test',
+    'X-Parse-REST-API-Key': 'rest',
+    'X-Parse-Master-Key': 'test'
+  };
+
+  /**
+   * Verifies simple passwords in GET login requests with special characters are scrubbed from the verbose log
+   */
+  it('does scrub simple passwords on GET login', done => {
+    reconfigureServer({
+      verbose: true
+    }).then(function() {
+      request.get({
+        headers: headers,
+        url: 'http://localhost:8378/1/login?username=test&password=simplepass.com'
+      }, () => {
+        request.get({
+          url: 'http://localhost:8378/1/scriptlog?size=4&level=verbose',
+          json: true,
+          headers: headers
+        }, (error, response, body) => {
+          expect(response.statusCode).toEqual(200);
+          // 4th entry is our actual GET request
+          expect(body[3].url).toEqual('/1/login?username=test&password=********');
+          expect(body[3].message).toEqual('REQUEST for [GET] /1/login?username=test&password=********: {}');
+          done();
+        });
+      });
+    });
+  });
+
+  /**
+   * Verifies complex passwords in GET login requests with special characters are scrubbed from the verbose log
+   */
+  it('does scrub complex passwords on GET login', done => {
+    reconfigureServer({
+      verbose: true
+    }).then(function() {
+      request.get({
+        headers: headers,
+        // using urlencoded password, 'simple @,/?:&=+$#pass.com'
+        url: 'http://localhost:8378/1/login?username=test&password=simple%20%40%2C%2F%3F%3A%26%3D%2B%24%23pass.com'
+      }, () => {
+        request.get({
+          url: 'http://localhost:8378/1/scriptlog?size=4&level=verbose',
+          json: true,
+          headers: headers
+        }, (error, response, body) => {
+          expect(response.statusCode).toEqual(200);
+          // 4th entry is our actual GET request
+          expect(body[3].url).toEqual('/1/login?username=test&password=********');
+          expect(body[3].message).toEqual('REQUEST for [GET] /1/login?username=test&password=********: {}');
+          done();
+        });
+      });
+    });
+  });
+
+  /**
+   * Verifies fields in POST login requests are NOT present in the verbose log
+   */
+  it('does not have password field in POST login', done => {
+    reconfigureServer({
+      verbose: true
+    }).then(function() {
+      request.post({
+        headers: headers,
+        url: 'http://localhost:8378/1/login',
+        data: {
+          username: 'test',
+          password: 'simplepass.com'
+        }
+      }, () => {
+        request.get({
+          url: 'http://localhost:8378/1/scriptlog?size=4&level=verbose',
+          json: true,
+          headers: headers
+        }, (error, response, body) => {
+          expect(response.statusCode).toEqual(200);
+          // 4th entry is our actual GET request
+          expect(body[3].url).toEqual('/1/login');
+          expect(body[3].message).toEqual('REQUEST for [POST] /1/login: {}');
+          done();
+        });
+      });
+    });
+  });
 });

spec/ParseQuery.Aggregate.spec.js

@@ -254,7 +254,8 @@ describe('Parse.Query Aggregate testing', () => {
     rp.get(Parse.serverURL + '/aggregate/TestObject', options)
       .then((resp) => {
         resp.results.forEach((result) => {
-          expect(result.name !== undefined).toBe(true);
+          expect(result.objectId).not.toBe(undefined);
+          expect(result.name).not.toBe(undefined);
           expect(result.sender).toBe(undefined);
           expect(result.size).toBe(undefined);
           expect(result.score).toBe(undefined);
@@ -263,6 +264,25 @@ describe('Parse.Query Aggregate testing', () => {
       }).catch(done.fail);
   });
 
+  it('multiple project query', (done) => {
+    const options = Object.assign({}, masterKeyOptions, {
+      body: {
+        project: { name: 1, score: 1, sender: 1 },
+      }
+    });
+    rp.get(Parse.serverURL + '/aggregate/TestObject', options)
+      .then((resp) => {
+        resp.results.forEach((result) => {
+          expect(result.objectId).not.toBe(undefined);
+          expect(result.name).not.toBe(undefined);
+          expect(result.score).not.toBe(undefined);
+          expect(result.sender).not.toBe(undefined);
+          expect(result.size).toBe(undefined);
+        });
+        done();
+      }).catch(done.fail);
+  });
+
   it('project with group query', (done) => {
     const options = Object.assign({}, masterKeyOptions, {
       body: {