File tree Expand file tree Collapse file tree 4 files changed +14
-11
lines changed Expand file tree Collapse file tree 4 files changed +14
-11
lines changed Original file line number Diff line number Diff line change 30
30
import java .util .concurrent .ThreadLocalRandom ;
31
31
32
32
public final class MavenWrapperDownloader {
33
- private static final String WRAPPER_VERSION = "3.3.3 " ;
33
+ private static final String WRAPPER_VERSION = "3.3.4 " ;
34
34
35
35
private static final boolean VERBOSE = Boolean .parseBoolean (System .getenv ("MVNW_VERBOSE" ));
36
36
@@ -45,8 +45,11 @@ public static void main(String[] args) {
45
45
try {
46
46
log (" - Downloader started" );
47
47
final URL wrapperUrl = URI .create (args [0 ]).toURL ();
48
- final String jarPath = args [1 ].replace (".." , "" ); // Sanitize path
49
- final Path wrapperJarPath = Paths .get (jarPath ).toAbsolutePath ().normalize ();
48
+ final Path baseDir = Paths .get ("." ).toAbsolutePath ().normalize ();
49
+ final Path wrapperJarPath = baseDir .resolve (args [1 ]).normalize ();
50
+ if (!wrapperJarPath .startsWith (baseDir )) {
51
+ throw new IOException ("Invalid path: outside of allowed directory" );
52
+ }
50
53
downloadFileFromURL (wrapperUrl , wrapperJarPath );
51
54
log ("Done" );
52
55
} catch (IOException e ) {
Original file line number Diff line number Diff line change
1
+ wrapperVersion =3.3.4
1
2
distributionType =source
2
3
distributionUrl =https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
3
- wrapperUrl =https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.3/maven-wrapper-3.3.3.jar
4
- wrapperVersion =3.3.3
4
+ wrapperUrl =https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar
Original file line number Diff line number Diff line change 19
19
# ----------------------------------------------------------------------------
20
20
21
21
# ----------------------------------------------------------------------------
22
- # Apache Maven Wrapper startup batch script, version 3.3.3
22
+ # Apache Maven Wrapper startup batch script, version 3.3.4
23
23
#
24
24
# Required ENV vars:
25
25
# ------------------
220
220
log " Couldn't find $wrapperJarPath , downloading it ..."
221
221
222
222
if [ -n " $MVNW_REPOURL " ]; then
223
- wrapperUrl=" $MVNW_REPOURL /org/apache/maven/wrapper/maven-wrapper/3.3.3 /maven-wrapper-3.3.3 .jar"
223
+ wrapperUrl=" $MVNW_REPOURL /org/apache/maven/wrapper/maven-wrapper/3.3.4 /maven-wrapper-3.3.4 .jar"
224
224
else
225
- wrapperUrl=" https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.3 /maven-wrapper-3.3.3 .jar"
225
+ wrapperUrl=" https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4 /maven-wrapper-3.3.4 .jar"
226
226
fi
227
227
while IFS=" =" read -r key value; do
228
228
case " $key " in wrapperUrl)
Original file line number Diff line number Diff line change 18
18
@ REM ----------------------------------------------------------------------------
19
19
20
20
@ REM ----------------------------------------------------------------------------
21
- @ REM Apache Maven Wrapper startup batch script, version 3.3.3
21
+ @ REM Apache Maven Wrapper startup batch script, version 3.3.4
22
22
@ REM
23
23
@ REM Required ENV vars:
24
24
@ REM JAVA_HOME - location of a JDK home dir
@@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
119
119
set WRAPPER_JAR = " %MAVEN_PROJECTBASEDIR% \.mvn\wrapper\maven-wrapper.jar"
120
120
set WRAPPER_LAUNCHER = org.apache.maven.wrapper.MavenWrapperMain
121
121
122
- set WRAPPER_URL = " https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.3 /maven-wrapper-3.3.3 .jar"
122
+ set WRAPPER_URL = " https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4 /maven-wrapper-3.3.4 .jar"
123
123
124
124
FOR /F " usebackq tokens=1,2 delims==" %%A IN (" %MAVEN_PROJECTBASEDIR% \.mvn\wrapper\maven-wrapper.properties" ) DO (
125
125
IF " %%A " == " wrapperUrl" SET WRAPPER_URL = %%B
@@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% (
133
133
)
134
134
) else (
135
135
if not " %MVNW_REPOURL% " == " " (
136
- SET WRAPPER_URL = " %MVNW_REPOURL% /org/apache/maven/wrapper/maven-wrapper/3.3.3 /maven-wrapper-3.3.3 .jar"
136
+ SET WRAPPER_URL = " %MVNW_REPOURL% /org/apache/maven/wrapper/maven-wrapper/3.3.4 /maven-wrapper-3.3.4 .jar"
137
137
)
138
138
if " %MVNW_VERBOSE% " == " true" (
139
139
echo Couldn't find %WRAPPER_JAR% , downloading it ...
You can’t perform that action at this time.
0 commit comments