Skip to content

Commit

Permalink
Merge pull request payara#524 from breakponchito/FISH-963-adding-vali…
Browse files Browse the repository at this point in the history 
…dation-for-invalid-version

Fish-963:Adding validation for invalid version and prevent downgrade of payara
  • Loading branch information
@breakponchito
breakponchito authored Dec 9, 2021
2 parents 114641f + 6bc59c5 commit 11a8473
Show file tree
Hide file tree
Showing 3 changed files with 332 additions and 10 deletions.
7 changes: 6 additions & 1 deletion appserver/extras/upgrade-tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) [2020] Payara Foundation and/or its affiliates. All rights reserved.
Copyright (c) [2020-2021] Payara Foundation and/or its affiliates. All rights reserved.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
Expand Down Expand Up @@ -57,5 +57,10 @@
<artifactId>server-mgmt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
129 changes: 120 additions & 9 deletions ...er/extras/upgrade-tool/src/main/java/fish/payara/extras/upgrade/UpgradeServerCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
*/
package fish.payara.extras.upgrade;

import com.sun.appserv.server.util.Version;
import com.sun.enterprise.admin.cli.CLICommand;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
import com.sun.enterprise.util.OS;
Expand Down Expand Up @@ -72,10 +73,10 @@
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.Arrays;
import java.util.Base64;
import java.util.Locale;
import java.util.*;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

Expand Down Expand Up @@ -137,6 +138,7 @@ protected void prevalidate() throws CommandException {
if (getOption(VERSION_PARAM_NAME) == null) {
prevalidateParameter(VERSION_PARAM_NAME);
}
preventVersionDowngrade();

if (getOption(NEXUS_PASSWORD_PARAM_NAME) == null) {
prevalidatePasswordParameter(NEXUS_PASSWORD_PARAM_NAME);
Expand Down Expand Up @@ -178,6 +180,100 @@ private void prevalidateParameter(String parameterName) throws CommandValidation
}
}

/**
* Method to prevent downgrade of current Payara version vs the option --version indicated for the
* upgrade-server command
*
* @throws CommandValidationException
*/
protected void preventVersionDowngrade() throws CommandValidationException {
List<String> versionList = getVersion();
if (!versionList.isEmpty()) {
String selectedVersion = versionList.get(0).trim();
Pattern pattern = Pattern.compile("([0-9]{1,2})\\.([0-9]{1,2})\\.([0-9]{1,2})(?!\\W\\w+)");
Matcher matcher = pattern.matcher(selectedVersion);
if (matcher.find()) {
if (matcher.groupCount() == 3) {
int majorSelectedVersion = Integer.parseInt(matcher.group(1).trim());
int minorSelectedVersion = Integer.parseInt(matcher.group(2).trim());
int updateSelectedVersion = Integer.parseInt(matcher.group(3).trim());
int majorCurrentVersion = Integer.parseInt(getCurrentMajorVersion());
int minorCurrentVersion = Integer.parseInt(getCurrentMinorVersion());
int updatedCurrentVersion = Integer.parseInt(getCurrentUpdatedVersion());
StringBuilder buildCurrentVersion = new StringBuilder().append(majorCurrentVersion).append(".")
.append(minorCurrentVersion).append(".").append(updatedCurrentVersion);
if (majorSelectedVersion < majorCurrentVersion) {
throwCommandValidationException(buildCurrentVersion.toString(), selectedVersion);
} else if (!(majorSelectedVersion > majorCurrentVersion)
&& (minorSelectedVersion < minorCurrentVersion)) {
throwCommandValidationException(buildCurrentVersion.toString(), selectedVersion);
} else if (!(majorSelectedVersion > majorCurrentVersion)
&& !(minorSelectedVersion > minorCurrentVersion)
&& (updateSelectedVersion < updatedCurrentVersion)) {
throwCommandValidationException(buildCurrentVersion.toString(), selectedVersion);
} else if (selectedVersion.equalsIgnoreCase(buildCurrentVersion.toString())) {
String message = String
.format("It was selected the same version: selected version %s and current version %s" +
", please verify and try again",
selectedVersion, buildCurrentVersion);
throw new CommandValidationException(message);
}
} else {
String message = String.format("Invalid selected version %s, please verify and try again",
selectedVersion);
throw new CommandValidationException(message);
}
} else {
String message = String.format("Invalid selected version %s, please verify and try again",
selectedVersion);
throw new CommandValidationException(message);
}
} else {
String message = "Empty selected version, please verify and try again";
throw new CommandValidationException(message);
}
}

/**
* Method to get selected Payara version from Upgrade command
* @return List<String>
*/
protected List<String> getVersion() {
return options.get(VERSION_PARAM_NAME);
}

/**
* Method to get the Current Payara Major Version
* @return String
*/
protected String getCurrentMajorVersion() {
return Version.getMajorVersion().trim();
}

/**
* Method to get the Current Payara Minor Version
* @return String
*/
protected String getCurrentMinorVersion() {
return Version.getMinorVersion().trim();
}

/**
* Method to get the Current Payara Updated Version
* @return String
*/
protected String getCurrentUpdatedVersion() {
return Version.getUpdateVersion().trim();
}

protected void throwCommandValidationException(String currentVersion, String selectedVersion)
throws CommandValidationException {
String message = String.format("The version indicated is incorrect. You can't downgrade " +
"from %s to %s please set correct version and try again",
currentVersion, selectedVersion);
throw new CommandValidationException(message);
}

/**
* Adapted from method in parent class, namely CLICommand#initializeCommandPassword
*
Expand Down Expand Up @@ -318,23 +414,27 @@ public int executeCommand() {
Files.copy(useDownloadedFile.toPath(), tempFile, StandardCopyOption.REPLACE_EXISTING);
} else {
LOGGER.log(Level.INFO, "Downloading new Payara version...");
URL nexusUrl = new URL(url);
HttpURLConnection connection = (HttpURLConnection) nexusUrl.openConnection();
HttpURLConnection connection = getConnection(url);
connection.setRequestProperty("Authorization", authBytes);

int code = connection.getResponseCode();
if (code != 200) {
LOGGER.log(Level.SEVERE, "Error connecting to server: {0}", code);
return ERROR;
if(code == 404) {
LOGGER.log(Level.SEVERE, "The version indicated is incorrect, please set correct version and try again");
throw new CommandValidationException("Payara version not found");
} else {
LOGGER.log(Level.SEVERE, "Error connecting to server: {0}", code);
return ERROR;
}
}

Files.copy(connection.getInputStream(), tempFile, StandardCopyOption.REPLACE_EXISTING);
}

FileInputStream unzipFileStream = new FileInputStream(tempFile.toFile());
unzippedDirectory = extractZipFile(unzipFileStream);
} catch (IOException ioe) {
LOGGER.log(Level.SEVERE, "Error preparing for upgrade, aborting upgrade: {0}", ioe);
} catch (IOException | CommandException e) {
LOGGER.log(Level.SEVERE, String.format("Error preparing for upgrade, aborting upgrade: %s",e));
return ERROR;
}
if (unzippedDirectory == null) {
Expand Down Expand Up @@ -423,6 +523,17 @@ public int executeCommand() {
return SUCCESS;
}

/**
* Method to return HttpURLConnection from String url
* @param url of type String
* @return HttpURLConnection
* @throws IOException
*/
protected HttpURLConnection getConnection(String url) throws IOException {
URL nexusUrl = new URL(url);
return (HttpURLConnection) nexusUrl.openConnection();
}

private Path extractZipFile(InputStream remote) throws IOException {
Path tempDirectory = Files.createTempDirectory("payara-new");

Expand Down
Loading

0 comments on commit 11a8473

Please sign in to comment.