packages/json-lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:01c71acb171023b1291f535c99d60512efd5084d
Branches Tags
packages:main
..
compare: packages:ce6865b8e21c38ccc5169dc2ba5760bb4155ce71
Branches Tags
packages:main

No commits in common. "01c71acb171023b1291f535c99d60512efd5084d" and "ce6865b8e21c38ccc5169dc2ba5760bb4155ce71" have entirely different histories.
01c71acb17 ... ce6865b8e2

3 changed files with 7 additions and 111 deletions
Show Stats Expand all files Collapse all files

81
0001-fix-Handle-unbalanced-comment-string.patch
View File

@ -1,81 +0,0 @@
From a0c4a0eae277130e22979cf307c95dec4005a78e Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@gmail.com>
Date: Thu, 26 Sep 2024 17:47:11 -0500
Subject: [PATCH] fix: Handle unbalanced comment string
---
.../src/main/java/net/sf/json/util/JSONTokener.java | 2 ++
.../src/test/java/net/sf/json/TestJSONSerializer.java | 9 +++++++++
src/main/java/net/sf/json/util/JSONTokener.java | 2 ++
src/test/java/net/sf/json/TestJSONSerializer.java | 9 +++++++++
4 files changed, 22 insertions(+)
diff --git a/jenkins-json-lib-2.4/src/main/java/net/sf/json/util/JSONTokener.java b/jenkins-json-lib-2.4/src/main/java/net/sf/json/util/JSONTokener.java
index 655cd7c..aad6f3b 100644
--- a/jenkins-json-lib-2.4/src/main/java/net/sf/json/util/JSONTokener.java
+++ b/jenkins-json-lib-2.4/src/main/java/net/sf/json/util/JSONTokener.java
@@ -192,6 +192,8 @@ public class JSONTokener {
if (c == '*') {
if (next() == '/') {
break;
+ } else if (!more()) {
+ return 0;
}
back();
}
diff --git a/jenkins-json-lib-2.4/src/test/java/net/sf/json/TestJSONSerializer.java b/jenkins-json-lib-2.4/src/test/java/net/sf/json/TestJSONSerializer.java
index 6a15863..d0c9ff4 100644
--- a/jenkins-json-lib-2.4/src/test/java/net/sf/json/TestJSONSerializer.java
+++ b/jenkins-json-lib-2.4/src/test/java/net/sf/json/TestJSONSerializer.java
@@ -139,6 +139,15 @@ public class TestJSONSerializer extends TestCase {
assertEquals(beanB.getValue(), ((ValueBean) bb).getValue());
}
+ public void testToJava_JSONObject_5() throws Exception {
+ try {
+ JSONObject.fromObject("/**");
+ fail("Should have thrown a JSONException");
+ } catch (JSONException expected) {
+ // ok
+ }
+ }
+
public void testToJava_JSONObject_and_reset() throws Exception {
String json = "{bool:true,integer:1,string:\"json\"}";
JSONObject jsonObject = JSONObject.fromObject(json);
diff --git a/src/main/java/net/sf/json/util/JSONTokener.java b/src/main/java/net/sf/json/util/JSONTokener.java
index 4f6ff94..0cdde2b 100644
--- a/src/main/java/net/sf/json/util/JSONTokener.java
+++ b/src/main/java/net/sf/json/util/JSONTokener.java
@@ -196,6 +196,8 @@ public class JSONTokener {
if( c == '*' ){
if( next() == '/' ){
break;
+ } else if (!more()){
+ return 0;
}
back();
}
diff --git a/src/test/java/net/sf/json/TestJSONSerializer.java b/src/test/java/net/sf/json/TestJSONSerializer.java
index 7397769..89c145d 100644
--- a/src/test/java/net/sf/json/TestJSONSerializer.java
+++ b/src/test/java/net/sf/json/TestJSONSerializer.java
@@ -139,6 +139,15 @@ public class TestJSONSerializer extends TestCase {
assertEquals( beanB.getValue(), ((ValueBean) bb).getValue() );
}
+ public void testToJava_JSONObject_5() throws Exception {
+ try {
+ JSONObject.fromObject("/**");
+ fail("Should have thrown a JSONException");
+ } catch (JSONException expected) {
+ // ok
+ }
+ }
+
public void testToJava_JSONObject_and_reset() throws Exception {
String json = "{bool:true,integer:1,string:\"json\"}";
JSONObject jsonObject = JSONObject.fromObject( json );
--
2.43.0

2
json-lib-2.4-jenkins-3.pom
View File

@ -228,7 +228,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.8</version>
<version>1.8.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>

35
json-lib.spec
View File

@ -1,6 +1,6 @@
Name: json-lib
Version: 2.4
Release: 23
Release: 16
Summary: JSON library for Java
License: ASL 2.0
URL: http://json-lib.sourceforge.net/
@ -10,15 +10,13 @@ Source0: %{name}-%{version}.tar.xz
Source1: jenkins-%{name}-%{version}.tar.xz
Source2: http://repo.jenkins-ci.org/releases/org/kohsuke/stapler/json-lib/%{version}-jenkins-3/json-lib-%{version}-jenkins-3.pom
Patch1: 0001-fix-Handle-unbalanced-comment-string.patch
BuildRequires: java-devel maven-local maven-shared maven-surefire-provider-junit
BuildRequires: mvn(commons-beanutils:commons-beanutils) mvn(commons-lang:commons-lang)
BuildRequires: mvn(commons-collections:commons-collections) mvn(junit:junit) mvn(log4j:log4j)
BuildRequires: mvn(commons-logging:commons-logging) mvn(net.sf.ezmorph:ezmorph)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) mvn(oro:oro) mvn(xom:xom)
BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin) mvn(xmlunit:xmlunit)
BuildRequires: mvn(org.codehaus.groovy:groovy) mvn(org.codehaus.groovy:groovy-all)
BuildRequires: mvn(org.codehaus.groovy:groovy18:1.8) mvn(org.codehaus.groovy:groovy18-all:1.8)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) mvn(antlr:antlr) mvn(asm:asm-all)
BuildRequires: mvn(commons-cli:commons-cli) mvn(org.slf4j:slf4j-nop)
@ -43,10 +41,8 @@ Obsoletes: %{name}-javadoc < %{version}-%{release}
Help documentation for json-lib package.
%prep
%setup -q %{name}-%{version}
%autosetup -n %{name}-%{version} -p1
tar xf %{SOURCE1}
%patch -P1 -p1
find -name "*.jar" -or -name "*.class" | xargs rm -rf
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:artifactId" groovy
@ -64,11 +60,13 @@ rm -r src/main/jdk15/net/sf/json/JSON*.java
</configuration>'
%pom_remove_dep :commons-httpclient
%pom_change_dep org.codehaus.groovy:groovy org.codehaus.groovy:groovy18:1.8
install %{SOURCE2} jenkins-json-lib-%{version}/pom.xml
cd jenkins-json-lib-%{version}
%pom_change_dep org.codehaus.groovy:groovy-all org.codehaus.groovy:groovy18-all:1.8
%mvn_file org.kohsuke.stapler:json-lib jenkins-%{name}
%mvn_package org.kohsuke.stapler:json-lib jenkins-json-lib
@ -76,7 +74,7 @@ cd -
%build
%mvn_file : json-lib
%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
cd jenkins-json-lib-%{version}
%mvn_build -f
@ -99,26 +97,5 @@ cd -
%license LICENSE.txt
%changelog
* Mon Oct 07 2024 Deyuan Fan <fandeyuan@kylinos.cn> - 2.4-23
- fix: Handle unbalanced comment string for CVE-2024-47855
* Mon Aug 22 2022 wangkai <wangkai385@h-partners.com> - 2.4-22
- Rebuild for log4j 2.17.2 fix CVE-2021-44832
* Tue May 31 2022 loong_C <loong_c@yeah.net> - 2.4-21
- update json-lib.spec
* Mon Dec 27 2021 yaoxin <yaoxin30@huawei.com> - 2.4-20
- This package depends on log4j.After the log4j vulnerability CVE-2021-45105 is fixed,the version needs to be rebuild.
* Mon Dec 20 2021 wangkai <wangkai385@huawei.com> - 2.4-19
- This package depends on log4j.After the log4j vulnerability CVE-2021-44228 is fixed,the version needs to be rebuild.
* Tue Feb 2 2021 wutao <wutao61@huawei.com> - 2.4-18
- change depdencies to groovy
* Mon Sep 14 2020 wangyue <wangyue92@huawei.com> - 2.4-17
- Fix build errors
* Sat Mar 07 2020 daiqianwen <daiqianwen@huawei.com> - 2.4-16
- Package init