From e156c80d173437635cccdd407afd65d09505f18d Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Thu, 26 Jan 2023 21:35:20 +0100 Subject: [PATCH 1/9] Update LICENSE --- LICENSE | 196 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 171 insertions(+), 25 deletions(-) diff --git a/LICENSE b/LICENSE index f11b38ba73..9a0ae76795 100644 --- a/LICENSE +++ b/LICENSE @@ -1,34 +1,180 @@ -BSD License +Copyright 2023 Parse Platform, www.parseplatform.org -For Parse Server software +-- -Copyright (c) 2015-present, Parse, LLC. All rights reserved. +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. +1. Definitions. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. - * Neither the name Parse nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. ------ + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. -As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS From 041f453e97820a6a479d736c9331e22d67a02631 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Thu, 26 Jan 2023 21:38:45 +0100 Subject: [PATCH 2/9] Update LICENSE --- LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 9a0ae76795..c2c52a1766 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ -Copyright 2023 Parse Platform, www.parseplatform.org +Copyright 2015-present Parse Platform, www.parseplatform.org +This work is licensed under the Apache License, Version 2.0. -- From 0af6160c65b3a5e00ec2287e4f07c03c405f646f Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Thu, 26 Jan 2023 21:41:21 +0100 Subject: [PATCH 3/9] Delete PATENTS --- PATENTS | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 PATENTS diff --git a/PATENTS b/PATENTS deleted file mode 100644 index a6dc00000d..0000000000 --- a/PATENTS +++ /dev/null @@ -1,37 +0,0 @@ -Additional Grant of Patent Rights Version 2 - -"Software" means the Parse Server software distributed by Parse, LLC. - -Parse, LLC. ("Parse") hereby grants to each recipient of the Software -("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable -(subject to the termination provision below) license under any Necessary -Claims, to make, have made, use, sell, offer to sell, import, and otherwise -transfer the Software. For avoidance of doubt, no license is granted under -Parse’s rights in any patent claims that are infringed by (i) modifications -to the Software made by you or any third party or (ii) the Software in -combination with any software or other technology. - -The license granted hereunder will terminate, automatically and without notice, -if you (or any of your subsidiaries, corporate affiliates or agents) initiate -directly or indirectly, or take a direct financial interest in, any Patent -Assertion: (i) against Parse or any of its subsidiaries or corporate -affiliates, (ii) against any party if such Patent Assertion arises in whole or -in part from any software, technology, product or service of Parse or any of -its subsidiaries or corporate affiliates, or (iii) against any party relating -to the Software. Notwithstanding the foregoing, if Parse or any of its -subsidiaries or corporate affiliates files a lawsuit alleging patent -infringement against you in the first instance, and you respond by filing a -patent infringement counterclaim in that lawsuit against that party that is -unrelated to the Software, the license granted hereunder will not terminate -under section (i) of this paragraph due to such counterclaim. - -A "Necessary Claim" is a claim of a patent owned by Parse that is -necessarily infringed by the Software standing alone. - -A "Patent Assertion" is any lawsuit or other action alleging direct, indirect, -or contributory infringement or inducement to infringe any patent, including a -cross-claim or counterclaim. - ------ - -As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. From db866a7c678a8a0a944e5bdfbfe74832b59059c5 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Thu, 26 Jan 2023 21:49:47 +0100 Subject: [PATCH 4/9] add NOTICE --- LICENSE | 11 +++-------- NOTICE | 10 ++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 NOTICE diff --git a/LICENSE b/LICENSE index c2c52a1766..4877592850 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,6 @@ -Copyright 2015-present Parse Platform, www.parseplatform.org -This work is licensed under the Apache License, Version 2.0. - --- - -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000000..b752ca146a --- /dev/null +++ b/NOTICE @@ -0,0 +1,10 @@ +Parse Server + +Copyright 2015-present Parse Platform + +This product includes software developed at Parse Platform. +www.parseplatform.org + +--- + +As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. From c491ab577b69ae6bbf7806f9b3cd0b9bf63fe166 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Thu, 26 Jan 2023 23:29:37 +0100 Subject: [PATCH 5/9] Update pull_request_template.md --- .github/pull_request_template.md | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 808550e2c3..8b99623f66 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,15 +1,11 @@ -### New Pull Request Checklist - +### Important -- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md). -- [ ] I am creating this PR in reference to an [issue](https://github.com/parse-community/parse-server/issues?q=is%3Aissue). +- Disclose security issues via [secure channels](https://github.com/parse-community/parse-server/blob/master/SECURITY.md). +- Any form of contribution is under this [license](../LICENSE). +- Link this pull request to an [issue](https://github.com/parse-community/parse-server/issues?q=is%3Aissue). -### Issue Description - +### Issue + Closes: FILL_THIS_OUT @@ -17,12 +13,9 @@ Closes: FILL_THIS_OUT ### TODOs before merging - + - [ ] Add tests -- [ ] Add changes to documentation (guides, repository pages, in-code descriptions) +- [ ] Add changes to documentation (guides, repository pages, code comments) - [ ] Add [security check](https://github.com/parse-community/parse-server/blob/master/CONTRIBUTING.md#security-checks) - [ ] Add new Parse Error codes to Parse JS SDK From 0dffb4ca6b4dba955ad2e3fd2170876b7650abda Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Thu, 26 Jan 2023 23:33:37 +0100 Subject: [PATCH 6/9] Update pull_request_template.md --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8b99623f66..d6e1839640 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -5,7 +5,7 @@ - Link this pull request to an [issue](https://github.com/parse-community/parse-server/issues?q=is%3Aissue). ### Issue - + Closes: FILL_THIS_OUT From 71b14ada4060214cee3d947c2da4ebbf1c58bc02 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Thu, 26 Jan 2023 23:36:00 +0100 Subject: [PATCH 7/9] Update pull_request_template.md --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d6e1839640..0b8694a99a 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -10,7 +10,7 @@ Closes: FILL_THIS_OUT ### Approach - + ### TODOs before merging From ed47a203112e6f8492978c3e3ac52b69fd2ba440 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Tue, 31 Jan 2023 00:17:54 +0100 Subject: [PATCH 8/9] more files to change --- .dockerignore | 2 -- NOTICE | 2 +- README.md | 7 ------- package.json | 4 ++-- src/vendor/mongodbUrl.js | 9 ++++----- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.dockerignore b/.dockerignore index da15e92511..693f3e35b5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,8 +1,6 @@ node_modules npm-debug.log *.md -PATENTS -LICENSE Dockerfile .dockerignore .gitignore diff --git a/NOTICE b/NOTICE index b752ca146a..ef5ddb2201 100644 --- a/NOTICE +++ b/NOTICE @@ -7,4 +7,4 @@ www.parseplatform.org --- -As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. +As of April 5, 2017, Parse, LLC has transferred this code to the Parse Platform organization, and will no longer be contributing to or distributing this code. diff --git a/README.md b/README.md index 1e9d180556..0288d5f4ba 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ [![Backers on Open Collective](https://opencollective.com/parse-server/backers/badge.svg)][open-collective-link] [![Sponsors on Open Collective](https://opencollective.com/parse-server/sponsors/badge.svg)][open-collective-link] -[![License][license-svg]][license-link] [![Forum](https://img.shields.io/discourse/https/community.parseplatform.org/topics.svg)](https://community.parseplatform.org/c/parse-server) [![Twitter](https://img.shields.io/twitter/follow/ParsePlatform.svg?label=Follow&style=social)](https://twitter.com/intent/follow?screen_name=ParsePlatform) [![Chat](https://img.shields.io/badge/Chat-Join!-%23fff?style=social&logo=slack)](https://chat.parseplatform.org) @@ -1204,12 +1203,6 @@ Support us with a monthly donation and help us continue our activities. [Become ------ - -As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. - -[license-svg]: https://img.shields.io/badge/license-BSD-lightgrey.svg -[license-link]: LICENSE [open-collective-link]: https://opencollective.com/parse-server [log_release]: https://github.com/parse-community/parse-server/blob/release/changelogs/CHANGELOG_release.md [log_beta]: https://github.com/parse-community/parse-server/blob/beta/changelogs/CHANGELOG_beta.md diff --git a/package.json b/package.json index 1dc024ef6f..36199f79df 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,11 @@ "public_html/", "views/", "LICENSE", - "PATENTS", + "NOTICE", "postinstall.js", "README.md" ], - "license": "BSD-3-Clause", + "license": "Apache-2.0", "dependencies": { "@babel/eslint-parser": "7.19.1", "@graphql-tools/merge": "8.3.6", diff --git a/src/vendor/mongodbUrl.js b/src/vendor/mongodbUrl.js index 7617293097..2aa422a9cd 100644 --- a/src/vendor/mongodbUrl.js +++ b/src/vendor/mongodbUrl.js @@ -1,8 +1,7 @@ -// A slightly patched version of node's url module, with support for mongodb:// -// uris. -// -// See https://github.com/nodejs/node/blob/master/LICENSE for licensing -// information +/* + * A slightly patched version of node's URL module, with support for `mongodb://` URIs. + * See https://github.com/nodejs/node for licensing information. + */ 'use strict'; From 2d54f2899fdab05b6f63e84c6a249c7fb307cb55 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Tue, 31 Jan 2023 00:48:23 +0100 Subject: [PATCH 9/9] Update pull_request_template.md --- .github/pull_request_template.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 0b8694a99a..a61c8e9625 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,19 +1,19 @@ -### Important +## Pull Request -- Disclose security issues via [secure channels](https://github.com/parse-community/parse-server/blob/master/SECURITY.md). -- Any form of contribution is under this [license](../LICENSE). +- Report security issues [confidentially](https://github.com/parse-community/parse-server/security/policy). +- Any contribution is under this [license](https://github.com/parse-community/parse-server/blob/alpha/LICENSE). - Link this pull request to an [issue](https://github.com/parse-community/parse-server/issues?q=is%3Aissue). -### Issue +## Issue Closes: FILL_THIS_OUT -### Approach +## Approach -### TODOs before merging - +## Tasks + - [ ] Add tests - [ ] Add changes to documentation (guides, repository pages, code comments)