hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-03 04:39:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

JS: handle additional multi-license file patterns

Browse Source
This commit is contained in:
Esben Sparre Andreasen
2018-12-11 09:55:38 +01:00
parent edbef289a7
commit 73aa223b08
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
javascript/ql/src/semmle/javascript/frameworks/Bundling.qll
View File

@@ -222,10 +222,10 @@ predicate isMultiLicenseBundle(TopLevel tl) {
)
) > 1
or
// case: ordinary block comments with "@license" lines
// case: ordinary block comments lines that start with a license
count(BlockComment head |
head.getTopLevel() = tl and
head.getLine(_).regexpMatch("(?i)[\\s*]*@license\\b.*")
head.getLine(_).regexpMatch("(?i)[\\s*]*(@license\\b.*|The [a-z0-9-]+ License (\\([a-z0-9-]+\\))?\\s*)")
) > 1
}

1
javascript/ql/test/query-tests/filters/ClassifyFiles/ClassifyFiles.expected
View File

@@ -16,6 +16,7 @@
| multi-part-bundle.js:0:0:0:0 | multi-part-bundle.js | generated |
| multiple-licenses-2.js:0:0:0:0 | multiple-licenses-2.js | generated |
| multiple-licenses-3.js:0:0:0:0 | multiple-licenses-3.js | generated |
| multiple-licenses-4.js:0:0:0:0 | multiple-licenses-4.js | generated |
| multiple-licenses.js:0:0:0:0 | multiple-licenses.js | generated |
| opal-test.js:0:0:0:0 | opal-test.js | generated |
| orgmode.html:0:0:0:0 | orgmode.html | generated |

6
javascript/ql/test/query-tests/filters/ClassifyFiles/multiple-licenses-4.js Normal file
View File

@@ -0,0 +1,6 @@
/**
* The MIT License (MIT)
*/
/**
* The MIT License (MIT)
*/