Merge pull request #133 from eclipse/license-detection

Enhanced License detection

Author: jbicker

server/src/main/java/org/eclipse/openvsx/util/LicenseDetection.java

@@ -9,7 +9,11 @@
  ********************************************************************************/
 package org.eclipse.openvsx.util;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -23,9 +27,8 @@
 
 public class LicenseDetection {
 
-    protected static final String[] DEFAULT_LICENSE_IDS = {
-        "MIT", "Apache-2.0", "Apache-1.1", "EPL-2.0", "EPL-1.0", "ISC", "BSD-2-Clause", "BSD-3-Clause"
-    };
+    protected static final String[] DEFAULT_LICENSE_IDS = { "MIT", "Apache-2.0", "Apache-1.1", "EPL-2.0", "EPL-1.0",
+            "ISC", "BSD-2-Clause", "BSD-3-Clause" };
 
     protected final Logger logger = LoggerFactory.getLogger(LicenseDetection.class);
 
@@ -55,6 +58,15 @@ public String detectLicense(String content) {
         try {
             for (var licenseId : licenseIds) {
                 var license = LicenseInfoFactory.getListedLicenseById(licenseId);
+                var resource = getClass().getResource("/spdx-templates/" + licenseId.toLowerCase() + ".txt");
+                if (resource != null) {
+                    try {
+                        var data = new String(Files.readAllBytes(Paths.get(resource.toURI())));
+                        license.setStandardLicenseTemplate(data);
+                    } catch (URISyntaxException | IOException e) {
+                        logger.error("Failed to load spdx template", e);
+                    } 
+                }
                 var diff = LicenseCompareHelper.isTextStandardLicense(license, content);
                 if (!diff.isDifferenceFound()) {
                     return license.getLicenseId();

server/src/main/resources/spdx-templates/mit.txt

@@ -0,0 +1,14 @@
+<<beginOptional>> MIT License<<endOptional>> 
+
+<<var;name="copyright";original="Copyright (c) <year> <copyright holders>";match=".{0,1000}">> 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of <<var;name="software";original="this software and associated documentation files";match="this software and associated documentation files|this source file">> 
+(the <<var;name="software2";original=""Software"";match="["]+Software["]+">>), to deal in the Software without restriction, including without 
+limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, 
+and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright 
+notice and this permission notice<<beginOptional>> (including the next paragraph)<<endOptional>> shall be included in all 
+copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED <<var;name="asis";original=""AS IS"";match="[*"]+AS IS[*"]+">>, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL <<var;name="copyrightHolder";original="THE AUTHORS OR COPYRIGHT HOLDERS";match=".+">> BE LIABLE FOR ANY CLAIM, 
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

server/src/test/resources/org/eclipse/openvsx/util/MIT.txt

@@ -1,19 +1,25 @@
-Copyright 2020 Tim Test
+PowerShell for Visual Studio Code
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the ""Software""), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to do 
 so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+The above copyright notice and this permission notice shall be included in all 
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.