Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for issue #62 #63

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Fix for issue #62 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b0832f
:ambulance: Fix for issue #62
pmonks Jul 26, 2024
01ca17d
:arrow_up: Upgrade dependency
pmonks Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
clj-xml-validation/clj-xml-validation {:mvn/version "1.0.2"}
tolitius/xml-in {:mvn/version "0.1.1"}
hato/hato {:mvn/version "1.0.0"}
dev.weavejester/medley {:mvn/version "1.8.0"}
dev.weavejester/medley {:mvn/version "1.8.1"}
miikka/clj-base62 {:mvn/version "0.1.1"}
com.github.pmonks/clj-spdx {:mvn/version "1.0.176"}
com.github.pmonks/rencg {:mvn/version "1.0.51"}
Expand Down
53 changes: 27 additions & 26 deletions src/lice_comb/impl/regex_matching.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@

(defn- get-rencgs
"Get a value for an re-ncg, potentially looking at multiple ncgs in order
until a non-blank value is found. Also trims and lower-cases the value, and
replaces all whitespace with a single space."
until a non-blank value is found. Returns `default` when no non-blank value is
found (and which defaults to `nil` if not provided). Trims and lower-cases the
value, and replaces all whitespace with a single space."
([m names] (get-rencgs m names nil))
([m names default]
(loop [f (first names)
Expand Down Expand Up @@ -123,8 +124,8 @@
"netbsd" "NetBSD"
"modification" "Modification"
("no military license" "no military licence") "No-Military-License"
("no nuclear license" "no nuclear licence") "No-Nuclear-License"
("no nuclear license 2014" "no nuclear licence 2014") "No-Nuclear-License-2014"
("no nuclear license" "no nuclear licence") "No-Nuclear-License"
"no nuclear warranty" "No-Nuclear-Warranty"
"open mpi" "Open-MPI"
"shortened" "Shortened"
Expand Down Expand Up @@ -186,27 +187,27 @@
(defn- gpl-id-constructor
"An SPDX id constructor specific to the GNU family of licenses."
[m]
(let [variant (cond (contains? m "agpl") "AGPL"
(contains? m "lgpl") "LGPL"
(contains? m "gpl") "GPL")
version (get-rencgs m ["version"] "")
version (s/replace version #"\p{Punct}+" ".")
(let [variant (cond (contains? m "agpl") "AGPL"
(contains? m "lgpl") "LGPL"
(contains? m "gpl") "GPL")
version-present? (boolean (get-rencgs m ["version"] false))
version (get-rencgs m ["version"] (if (= variant "LGPL") "2.0" "1.0"))
version (s/replace version #"\p{Punct}+" ".")
[confidence confidence-explanations]
(if (s/blank? version)
[:low #{:missing-version}]
(if (s/includes? version ".")
[:high]
[:medium #{:partial-version}]))
version (if (s/blank? version)
(:latest-ver m)
version)
version (if (s/includes? version ".")
version
(str version ".0"))
suffix (if (contains? m "orLater")
"or-later"
"only") ; Note: we (conservatively) default to "only" when we don't have an explicit suffix
id (str variant "-" version "-" suffix)]
(if (s/blank? version)
[:low #{:missing-version}]
(if (s/includes? version ".")
[:high]
[:medium #{:partial-version}]))
version (if (s/includes? version ".")
version
(str version ".0"))
[suffix confidence-explanations]
(cond (contains? m "orLater") ["or-later" confidence-explanations]
(contains? m "only") ["only" confidence-explanations]
:else [(if version-present? "only" "or-later") ; Note: on the advice of SPDX technical team, default to "or later" variant if version not present
(set/union #{:missing-version-suffix} confidence-explanations)])
id (str variant "-" version "-" suffix)]
[(assert-listed-id id) confidence confidence-explanations]))

(defn- simple-regex-match
Expand All @@ -221,9 +222,9 @@


; The regex for the GNU family is a nightmare, so we build it up (and test it) in pieces
(def agpl-re #"(?<agpl>AGPL|Affero)(\s+GNU)?(\s+General)?(\s+Public)?(\s+Licen[cs]e)?(\s+\(?AGPL\)?)?")
(def lgpl-re #"(?<lgpl>L\s?GPL|GNU\s+(Library|Lesser)|(Library|Lesser)\s+(L?GPL|General\s+Public\s+Licen[cs]e))(\s+or\s+Lesser)?(\s+General)?(\s+Pub?lic)?(\s+Licen[cs]e)?(\s+\(?LGPL\)?)?")
(def gpl-re #"(?<!(Affero|Lesser|Library)\s+)(?<gpl>GNU(?!\s+Classpath)|(?<!(L|A)\s*)GPL|General\s+Public\s+Licen[cs]e)(?!\s+(Affero|Library|Lesser|General\s+Lesser|General\s+Library|LGPL|AGPL))((\s+General)?(?!\s+(Affero|Lesser|Library))\s+Public\s+Licen[cs]e)?(\s+\(?GPL\)?)?")
(def agpl-re #"(?<agpl>AGPL|Affero)(\s+GNU)?(\s+Genere?al)?(\s+Pub?lic)?(\s+Licen[cs]e)?(\s+\(?AGPL\)?)?")
(def lgpl-re #"(?<lgpl>(GNU\s+(Genere?al\s+)?(Library\s+or\s+Lesser|Library|Lesser))|((Library\s+or\s+Lesser|Library|Lesser)\s+(GNU|GPL|Genere?al)|(L(esser\s)?\s*GPL)))(\s+Genere?al)?(\s+Pub?lic)?(\s+Licen[cs]e)?(\s+\(?L\s*GPL\)?)?")
(def gpl-re #"(?<!(Affero|Lesser|Library)\s+)(?<gpl>GNU(?!\s+Classpath)|(?<!(L|A)\s*)GPL|Genere?al\s+Pub?lic\s+Licen[cs]e)(?!\s+(Affero|Library|Lesser|Genere?al\s+Lesser|Genere?al\s+Library|LGPL|AGPL))((\s+General)?(?!\s+(Affero|Lesser|Library))\s+Pub?lic\s+Licen[cs]e)?(\s+\(?GPL\)?)?")
(def version-re #"[\s,-]*(_?V(ersion)?)?[\s\._]*(?<version>\d+([\._]\d+)?)?")
(def only-or-later-re #"[\s,-]*((?<only>\(?only\)?)|(\(?or(\s+\(?at\s+your\s+(option|discretion)\)?)?(\s+any)?)?([\s-]*(?<orLater>lat[eo]r|newer|greater|\+)))?")
(def gnu-re (lciu/re-concat "(?x)(?i)\\b(\n# Alternative 1: AGPL\n"
Expand Down
4 changes: 2 additions & 2 deletions test/lice_comb/deps_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@
(is (nil? (dep->expressions ['slipset/deps-deploy {:deps/manifest :mvn :mvn/version "0.2.0"}])))
(is (nil? (dep->expressions ['borkdude/sci.impl.reflector {:deps/manifest :mvn :mvn/version "0.0.1"}]))))
(testing "Valid deps - multi license"
(is (valid= #{"EPL-1.0 OR LGPL-3.0-only"} (dep->expressions ['ch.qos.logback/logback-classic {:deps/manifest :mvn :mvn/version "1.2.7"}])))
(is (valid= #{"EPL-1.0 OR LGPL-3.0-only"} (dep->expressions ['ch.qos.logback/logback-core {:deps/manifest :mvn :mvn/version "1.2.7"}])))
(is (valid= #{"EPL-1.0 OR LGPL-2.0-or-later"} (dep->expressions ['ch.qos.logback/logback-classic {:deps/manifest :mvn :mvn/version "1.2.7"}])))
(is (valid= #{"EPL-1.0 OR LGPL-2.0-or-later"} (dep->expressions ['ch.qos.logback/logback-core {:deps/manifest :mvn :mvn/version "1.2.7"}])))
(is (valid= #{"CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0"} (dep->expressions ['javax.mail/mail {:deps/manifest :mvn :mvn/version "1.4.7"}])))
(is (valid= #{"Apache-2.0 OR LGPL-2.1-or-later"} (dep->expressions ['net.java.dev.jna/jna-platform {:deps/manifest :mvn :mvn/version "5.10.0"}])))
(is (valid= #{"GPL-2.0-only WITH Classpath-exception-2.0 OR MIT"} (dep->expressions ['org.checkerframework/checker-compat-qual {:deps/manifest :mvn :mvn/version "2.5.5"}])))
Expand Down
Loading
Loading