Do not percent-encode '+' in classpath-jar manifest Class-Path entrie… · bazelbuild/rules_java@35e8391 · GitHub

1. bazelbuild
2. rules_java

Repository navigation

• Code
• Issues21 (21)
• Pull requests10 (10)
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Commit 35e8391

Browse filesBrowse the repository at this point in the historyBrowse files

mgalindo-sc

authored and

rules_java Copybara

committed

Do not percent-encode '+' in classpath-jar manifest Class-Path entries (#358)

Add '+' to the allowed character class so it passes through literally. The java stub template packs over-long classpaths into a classpath jar whose manifest Class-Path entries percent-encode any character outside [-_.~/a-zA-Z0-9]. Bzlmod canonical repository names put '+' into every external-repo classpath entry, so those entries now contain "%2b" sequences. '+' is a valid URI path character and needs no encoding, and the "%2b" breaks consumers that pass classpath URLs through printf-style formatting Closes #358 COPYBARA_INTEGRATE_REVIEW=#358 from mgalindo-sc:patch-1 367ccce PiperOrigin-RevId: 931225696 Change-Id: I3c4e215afc4c67e25e48485cd58d0c2fe2dcd74c

1 parent 1f215f8 commit 35e8391
Copy full SHA for 35e8391

1 file changed

+2-2Lines changed: 2 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• java/bazel/rules
  • java_stub_template.txt

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎java/bazel/rules/java_stub_template.txt‎

Copy file name to clipboardExpand all lines: java/bazel/rules/java_stub_template.txt

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -315,14 +315,14 @@ function create_classpath_jar() {
315	315	for path in ${CLASSPATH}; do
316	316	# Loop through the characters of the path and convert characters that are
317	317	# not alphanumeric nor -_.~/ to their 2-digit hexadecimal representation
318		- if [[ ! $path =~ ^[-_.~/a-zA-Z0-9]*$ ]]; then
	318	+ if [[ ! $path =~ ^[-_.~/a-zA-Z0-9+]*$ ]]; then
319	319	local i c buff
320	320	local converted_path=""
321	321
322	322	for ((i=0; i<${#path}; i++)); do
323	323	c=${path:$i:1}
324	324	case ${c} in
325		- [-_.~/a-zA-Z0-9] ) buff=${c} ;;
	325	+ [-_.~/a-zA-Z0-9+] ) buff=${c} ;;
326	326	* ) printf -v buff '%%%02x' "'$c'"
327	327	esac
328	328	converted_path+="${buff}"

0 commit comments

Comments

0 (0)