The Unified and Autonomous Development Platform
Fix issue #1051 - Wrong pull request creation URL on push
Robin Shen475b4d2c0281
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.javaindex fb16cc29b1..dd22c3622a 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java@@ -1,857 +1,855 @@-package io.onedev.server.commandhandler;--import static org.hibernate.cfg.AvailableSettings.DIALECT;--import java.io.File;-import java.io.IOException;-import java.nio.charset.Charset;-import java.nio.charset.StandardCharsets;-import java.util.ArrayList;-import java.util.List;-import java.util.Properties;-import java.util.concurrent.atomic.AtomicInteger;--import javax.inject.Singleton;--import org.apache.commons.lang3.SystemUtils;-import org.joda.time.DateTime;-import org.joda.time.format.DateTimeFormat;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.base.Joiner;--import io.onedev.commons.bootstrap.Bootstrap;-import io.onedev.commons.loader.AbstractPlugin;-import io.onedev.commons.utils.FileUtils;-import io.onedev.commons.utils.StringUtils;-import io.onedev.commons.utils.command.Commandline;-import io.onedev.commons.utils.command.LineConsumer;-import io.onedev.server.OneDev;-import io.onedev.server.migration.DataMigrator;-import io.onedev.server.migration.MigrationHelper;-import io.onedev.server.persistence.HibernateConfig;-import io.onedev.server.security.SecurityUtils;--@Singleton-public class Upgrade extends AbstractPlugin {-- public static final String COMMAND = "upgrade";-- private static final Logger logger = LoggerFactory.getLogger(Upgrade.class);-- public static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";-- public static final String DB_BACKUP_DIR = "db-backup";-- private static final String RELEASE_PROPS_FILE = "release.properties";-- public static final String INCOMPATIBILITIES = "incompatibilities/incompatibilities.md";-- public static final String INCOMPATIBILITIES_SINCE_UPGRADED_VERSION = "incompatibilities/since-upgraded-version.md";-- public static final String CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION = "incompatibilities/checked-since-upgraded-version.md";-- protected Commandline buildCommandline(File upgradeDir, String command, String...commandArgs) {- String version = loadReleaseProps(new File(upgradeDir, RELEASE_PROPS_FILE)).getProperty("version");-- if (version == null) {- File versionFile = new File(upgradeDir, "version.txt");- if (versionFile.exists()) {- try {- version = FileUtils.readFileToString(versionFile, Charset.defaultCharset()).trim();- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }-- if (version == null)- version = "1.0-EAP-build26";-- String bootstrapClass;- if (version.startsWith("1.0-EAP")) {- int build = Integer.parseInt(StringUtils.substringAfterLast(version, "build"));- if (build <= 26)- bootstrapClass = "com.gitplex.commons.bootstrap.Bootstrap";- else- bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";- } else if (version.startsWith("1.0.0")) {- bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";- } else if (version.startsWith("1.0.1")) {- bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap";- } else if (version.startsWith("2.0.")) {- bootstrapClass = "io.onedev.launcher.bootstrap.Bootstrap";- } else if (version.startsWith("3.") || version.startsWith("4.0.") || version.startsWith("4.1.")- || version.startsWith("4.2.") || version.startsWith("4.3.") || version.startsWith("4.4.")- || version.startsWith("4.5.") || version.startsWith("4.6.") || version.startsWith("4.7.")- || version.startsWith("4.8.") || version.startsWith("4.9.")) {- bootstrapClass = "io.onedev.commons.launcher.bootstrap.Bootstrap";- } else {- bootstrapClass = "io.onedev.commons.bootstrap.Bootstrap";- }-- if (version.startsWith("1.") || version.startsWith("2.")) {- switch (command) {- case "check-data-version":- command = "check_data_version";- break;- case "backup-db":- command = "backup";- break;- case "clean-db":- command = "clean";- break;- }- }- Commandline cmdline= new Commandline(System.getProperty("java.home") + "/bin/java");- cmdline.addArgs(- "-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m",- "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",- "--add-opens=java.base/java.lang=ALL-UNNAMED",- "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",- "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",- "--add-opens=java.base/java.util=ALL-UNNAMED",- "--add-opens=java.base/java.text=ALL-UNNAMED",- "--add-opens=java.desktop/java.awt.font=ALL-UNNAMED",- "--add-modules=java.se",- "--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED",- "--add-opens=java.management/sun.management=ALL-UNNAMED",- "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED",- "-classpath", "*", bootstrapClass,- command);- cmdline.addArgs(commandArgs);- cmdline.workingDir(new File(upgradeDir, "boot"));- return cmdline;- }-- private String prefixUpgradeTargetLog(String line) {- return ">>> " + line;- }-- private String getDialect(File installDir) {- String dialect = System.getenv(DIALECT.replace('.', '_'));- if (dialect == null) {- File file = new File(installDir, "conf/hibernate.properties");- dialect = FileUtils.loadProperties(file).getProperty(DIALECT);- }- return dialect;- }-- private Properties loadReleaseProps(File releasePropsFile) {- if (releasePropsFile.exists())- return FileUtils.loadProperties(releasePropsFile);- else- return new Properties();- }-- @Override- public void start() {- SecurityUtils.bindAsSystem();-- if (Bootstrap.command.getArgs().length == 0) {- logger.error("Missing upgrade target parameter. Usage: {} <OneDev installation directory>",- Bootstrap.command.getScript());- System.exit(1);- }-- File upgradeDir = new File(Bootstrap.command.getArgs()[0]);- if (!upgradeDir.isAbsolute() && System.getenv("WRAPPER_INIT_DIR") != null)- upgradeDir = new File(System.getenv("WRAPPER_INIT_DIR"), upgradeDir.getPath());-- if (!upgradeDir.exists()) {- logger.error("Unable to find directory: {}", upgradeDir.getAbsolutePath());- System.exit(1);- } else if (!upgradeDir.isDirectory()) {- logger.error("A directory is expected: {}", upgradeDir.getAbsolutePath());- System.exit(1);- }-- boolean isEmpty = true;- for (File file: upgradeDir.listFiles()) {- if (!file.getName().equals("lost+found") && !file.getName().equals("site")) {- isEmpty = false;- break;- }- }- if (!isEmpty) {- if (!new File(upgradeDir, "boot/bootstrap.keys").exists()) {- logger.error("Invalid OneDev installation directory: {}, make sure you are specifying the top level "- + "installation directory (it contains sub directories such as \"bin\", \"boot\", \"conf\", etc)",- upgradeDir.getAbsolutePath());- System.exit(1);- }-- Properties releaseProps = loadReleaseProps(new File(Bootstrap.installDir, RELEASE_PROPS_FILE));- Properties oldReleaseProps = loadReleaseProps(new File(upgradeDir, RELEASE_PROPS_FILE));-- if (!releaseProps.equals(oldReleaseProps)) {- logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());-- if (OneDev.isServerRunning(upgradeDir) || OneDev.isServerRunning(Bootstrap.installDir)) {- logger.error("Please stop server before upgrading");- System.exit(1);- }-- for (File file: new File(upgradeDir, "lib").listFiles()) {- if (file.getName().contains("mariadb") || file.getName().contains("mysql")- || file.getName().contains("ojdbc") || file.getName().contains("postgresql")- || file.getName().contains("sqljdbc")) {- try {- File destDir = new File(upgradeDir, "site/lib");- FileUtils.createDir(destDir);- FileUtils.copyFileToDirectory(file, destDir);- FileUtils.deleteFile(file);- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }-- File statusDir = new File(upgradeDir, "status");- if (statusDir.exists())- FileUtils.cleanDir(statusDir);-- AtomicInteger oldDataVersion = new AtomicInteger(0);-- int ret = buildCommandline(upgradeDir, "check-data-version").execute(new LineConsumer() {-- @Override- public void consume(String line) {- String prefix = "Data version: ";- if (line.startsWith(prefix)) {- oldDataVersion.set(Integer.parseInt(line.substring(prefix.length())));- logger.info("Old data version: " + oldDataVersion.get());- } else {- logger.info(prefixUpgradeTargetLog(line));- }- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logger.error(prefixUpgradeTargetLog(line));- }}-- ).getReturnCode();-- if (ret != 0) {- logger.error("Unable to upgrade specified installation due to above error");- System.exit(1);- }-- int newDataVersion = Integer.parseInt(MigrationHelper.getVersion(DataMigrator.class));-- if (oldDataVersion.get() > newDataVersion) {- logger.error("App is too old, please use a newer version");- System.exit(1);- }-- String timestamp = DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime());- File programBackup = new File(upgradeDir, "site/program-backup/" + timestamp);- FileUtils.createDir(programBackup);-- logger.info("Backing up old program files as {}...", programBackup.getAbsolutePath());- try {- for (File each: upgradeDir.listFiles()) {- if (each.isFile())- FileUtils.copyFileToDirectory(each, programBackup);- else if (!each.getName().equals("temp") && !each.getName().equals("site") && !each.getName().equals("sampledb"))- FileUtils.copyDirectoryToDirectory(each, programBackup);- }- } catch (IOException e) {- throw new RuntimeException(e);- }- restoreExecutables(programBackup);-- File dbBackupFile = new File(upgradeDir, "site/" + DB_BACKUP_DIR + "/" + timestamp + ".zip");- boolean failed = false;- boolean dbChanged = false;- boolean dbCleaned = false;- try {- if (oldDataVersion.get() != newDataVersion) {- logger.info("Backing up database as {}...", dbBackupFile.getAbsolutePath());-- FileUtils.createDir(dbBackupFile.getParentFile());-- ret = buildCommandline(upgradeDir, "backup-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {-- @Override- public void consume(String line) {- logger.info(prefixUpgradeTargetLog(line));- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logger.error(prefixUpgradeTargetLog(line));- }-- }).getReturnCode();-- if (ret == 0) {- dbChanged = true;- if (HibernateConfig.isHSQLDialect(getDialect(upgradeDir))) {- FileUtils.deleteDir(new File(upgradeDir, "sampledb"), 3);- } else {- logger.info("Cleaning database with old program...");-- ret = buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {-- @Override- public void consume(String line) {- logger.info(prefixUpgradeTargetLog(line));- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logger.error(prefixUpgradeTargetLog(line));- }-- }).getReturnCode();- }- if (ret == 0)- dbCleaned = true;- }-- if (ret == 0) {- logger.info("Updating program files...");- updateProgramFiles(upgradeDir, oldDataVersion.get());-- dbCleaned = false;- logger.info("Restoring database with new program...");- ret = buildCommandline(upgradeDir, "restore-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {-- @Override- public void consume(String line) {- logger.info(prefixUpgradeTargetLog(line));- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logger.error(prefixUpgradeTargetLog(line));- }-- }).getReturnCode();- }-- if (ret != 0) {- logger.error("Failed to upgrade {}", upgradeDir.getAbsolutePath());- failed = true;- }- } else {- logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());- updateProgramFiles(upgradeDir, oldDataVersion.get());- }- } catch (Exception e) {- logger.error("Error upgrading " + upgradeDir.getAbsolutePath(), e);- failed = true;- }-- if (failed) {- if (dbChanged && !dbCleaned) {- logger.info("Cleaning database with new program...");- try {- buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {-- @Override- public void consume(String line) {- logger.info(prefixUpgradeTargetLog(line));- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logger.error(prefixUpgradeTargetLog(line));- }-- }).checkReturnCode();-- dbCleaned = true;- } catch (Exception e) {- logger.error("Error cleaning database", e);- }- }-- boolean programRestored = false;- logger.info("Restoring old program files...");- try {- for (File child: programBackup.listFiles()) {- if (!child.getName().equals("site")) {- File target = new File(upgradeDir, child.getName());- if (target.isDirectory()) {- FileUtils.cleanDir(target);- FileUtils.copyDirectory(child, target);- } else {- FileUtils.copyFile(child, target);- }- }- }-- if (oldDataVersion.get() <= 102)- FileUtils.createDir(new File(upgradeDir, "site/assets/root"));-- restoreExecutables(upgradeDir);- FileUtils.deleteDir(programBackup);-- logger.info("Old program files restored");- programRestored = true;- } catch (Exception e) {- logger.error("Error restoring old program files", e);- logger.warn("Please restore manually from \"{}\"", programBackup.getAbsolutePath());- }-- if (programRestored && dbChanged && dbCleaned) {- logger.info("Restoring old database...");- try {- buildCommandline(upgradeDir, "restore-db", dbBackupFile.getAbsolutePath(), "false").execute(new LineConsumer() {-- @Override- public void consume(String line) {- logger.info(prefixUpgradeTargetLog(line));- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logger.error(prefixUpgradeTargetLog(line));- }-- }).checkReturnCode();-- logger.info("Old database restored");- dbChanged = false;- } catch (Exception e) {- logger.error("Error restoring old database", e);- }- }-- logger.error("!!!!!!!!! Failed to upgrade {} !!!!!!!!!!!", upgradeDir.getAbsolutePath());- if (dbChanged) {- logger.warn("OneDev is unable to restore old database, please do it manually by first resetting it (delete and create), and then running below command:");- if (SystemUtils.IS_OS_WINDOWS) {- logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore-db.bat " + dbBackupFile.getAbsolutePath());- } else {- logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore-db.sh " + dbBackupFile.getAbsolutePath());- }- }- System.exit(1);- } else {- logger.info("********** Successfully upgraded {} **********", upgradeDir.getAbsolutePath());-- if (oldDataVersion.get() <= 5) {- logger.warn("\n"- + "************************* IMPORTANT NOTICE *************************\n"- + "* OneDev password hash algorithm has been changed for security *\n"- + "* reason. Please reset administrator password with the *\n"- + "* reset_admin_password command. Other users' password will be *\n"- + "* reset and sent to their mail box automatically when they logs *\n"- + "* into OneDev. *\n"- + "********************************************************************");- }- FileUtils.deleteDir(programBackup);- System.exit(0);- }- } else {- logger.info("*********** Successfully checked {} ************", upgradeDir.getAbsolutePath());- System.exit(0);- }- } else {- logger.info("Populating {}...", upgradeDir.getAbsolutePath());-- if (OneDev.isServerRunning(Bootstrap.installDir)) {- logger.error("Please stop server before populating");- System.exit(1);- }-- try {- FileUtils.copyDirectory(Bootstrap.installDir, upgradeDir);- FileUtils.cleanDir(new File(upgradeDir, "logs"));- restoreExecutables(upgradeDir);- logger.info("*********** Successfully populated {} ************", upgradeDir.getAbsolutePath());- System.exit(0);- } catch (Exception e) {- logger.error("!!!!!!! Error populating " + upgradeDir.getAbsolutePath() + " !!!!!!!!", e);- FileUtils.cleanDir(upgradeDir);- System.exit(1);- }- }- }-- protected void updateProgramFiles(File upgradeDir, int oldDataVersion) {- cleanAndCopy(new File(Bootstrap.installDir, "3rdparty-licenses"), new File(upgradeDir, "3rdparty-licenses"));-- File siteServerScriptFile = new File(upgradeDir, "bin/server.sh");- for (File file: Bootstrap.getBinDir().listFiles()) {- if (!file.getName().endsWith(".pid") && !file.getName().endsWith(".status")) {- try {- String serverScript = null;- if (file.getName().equals("server.sh")) {- serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());-- String siteRunAsUserLine = null;- for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {- if (line.contains("RUN_AS_USER")) {- siteRunAsUserLine = line;- break;- }- }- if (siteRunAsUserLine != null) {- String runAsUserLine = null;- for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {- if (line.contains("RUN_AS_USER")) {- runAsUserLine = line;- break;- }- }- if (runAsUserLine != null)- serverScript = StringUtils.replace(serverScript, runAsUserLine, siteRunAsUserLine);- }-- String siteFilesToSourceLine = null;- for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {- if (line.contains("FILES_TO_SOURCE") && !line.startsWith("#")) {- siteFilesToSourceLine = line;- break;- }- }- if (siteFilesToSourceLine != null) {- String filesToSourceLine = null;- for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {- if (line.contains("FILES_TO_SOURCE") && !line.startsWith("#")) {- filesToSourceLine = line;- break;- }- }- if (filesToSourceLine != null)- serverScript = StringUtils.replace(serverScript, filesToSourceLine, siteFilesToSourceLine);- }- }- if (serverScript != null)- FileUtils.writeStringToFile(siteServerScriptFile, serverScript, Charset.defaultCharset());- else- FileUtils.copyFile(file, new File(upgradeDir, "bin/" + file.getName()));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }-- if (new File(upgradeDir, "bin/apply_db_constraints.bat").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/apply_db_constraints.bat"));- if (new File(upgradeDir, "bin/apply_db_constraints.sh").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/apply_db_constraints.sh"));- if (new File(upgradeDir, "bin/backup.bat").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/backup.bat"));- if (new File(upgradeDir, "bin/backup.sh").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/backup.sh"));- if (new File(upgradeDir, "bin/restore.bat").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/restore.bat"));- if (new File(upgradeDir, "bin/restore.sh").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/restore.sh"));- if (new File(upgradeDir, "bin/reset_admin_password.bat").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.bat"));- if (new File(upgradeDir, "bin/reset_admin_password.sh").exists())- FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.sh"));-- FileUtils.deleteDir(new File(upgradeDir, "status"));-- cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));- cleanAndCopy(new File(Bootstrap.installDir, "agent"), new File(upgradeDir, "agent"));- if (new File(upgradeDir, "boot/system.classpath").exists())- FileUtils.deleteFile(new File(upgradeDir, "boot/system.classpath"));-- cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));-- FileUtils.createDir(new File(upgradeDir, "site/assets"));- if (new File(upgradeDir, "site/robots.txt").exists()) {- try {- FileUtils.copyFile(- new File(upgradeDir, "site/robots.txt"),- new File(upgradeDir, "site/assets/robots.txt"));- FileUtils.deleteFile(new File(upgradeDir, "site/robots.txt"));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- if (new File(upgradeDir, "site/logo.png").exists()) {- try {- FileUtils.copyFile(- new File(upgradeDir, "site/logo.png"),- new File(upgradeDir, "site/assets/logo.png"));- FileUtils.deleteFile(new File(upgradeDir, "site/logo.png"));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- if (new File(upgradeDir, "site/avatars").exists()) {- try {- FileUtils.copyDirectory(- new File(upgradeDir, "site/avatars"),- new File(upgradeDir, "site/assets/avatars"));- FileUtils.deleteDir(new File(upgradeDir, "site/avatars"));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- for (File file: new File(Bootstrap.getSiteDir(), "assets/avatars").listFiles()) {- if (file.isFile()) {- try {- FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/assets/avatars"));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }- File uploadedDir = new File(upgradeDir, "site/assets/avatars/uploaded");- File userUploadsDir = new File(uploadedDir, "users");- if (uploadedDir.exists() && !userUploadsDir.exists()) {- FileUtils.createDir(userUploadsDir);- for (File file: uploadedDir.listFiles()) {- if (file.isFile()) {- try {- FileUtils.moveFileToDirectory(file, userUploadsDir, false);- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }- }-- if (oldDataVersion <= 102) {- File assetsRootDir = new File(upgradeDir, "site/assets/root");- FileUtils.createDir(assetsRootDir);- if (new File(upgradeDir, "site/assets/robots.txt").exists()) {- try {- FileUtils.copyFile(- new File(upgradeDir, "site/assets/robots.txt"),- new File(assetsRootDir, "robots.txt"));- FileUtils.deleteFile(new File(upgradeDir, "site/assets/robots.txt"));- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- for (File file: assetsRootDir.listFiles()) {- try {- FileUtils.moveToDirectory(file, new File(upgradeDir, "site/assets"), true);- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- FileUtils.deleteDir(assetsRootDir);-- File usersDir = new File(upgradeDir, "site/users");- if (usersDir.exists()) {- for (File file: usersDir.listFiles()) {- File oldVisitInfoDir = new File(file, "info");- File projectDir = new File(upgradeDir, "site/projects/" + file.getName());- if (oldVisitInfoDir.exists() && projectDir.exists()) {- File newVisitInfoDir = new File(projectDir, "info/visit");- FileUtils.createDir(newVisitInfoDir.getParentFile());- FileUtils.deleteDir(newVisitInfoDir);- try {- FileUtils.moveDirectory(oldVisitInfoDir, newVisitInfoDir);- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }- FileUtils.deleteDir(usersDir);- }- FileUtils.deleteDir(new File(upgradeDir, "site/info"));- }-- try {- File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");- String wrapperConf = FileUtils.readFileToString(wrapperConfFile, StandardCharsets.UTF_8);- wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap",- "io.onedev.commons.launcher.bootstrap.Bootstrap");- wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap",- "io.onedev.commons.launcher.bootstrap.Bootstrap");- wrapperConf = StringUtils.replace(wrapperConf, "com.turbodev.launcher.bootstrap.Bootstrap",- "io.onedev.commons.launcher.bootstrap.Bootstrap");- wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.launcher.bootstrap.Bootstrap",- "io.onedev.commons.launcher.bootstrap.Bootstrap");- wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.commons.launcher.bootstrap.Bootstrap",- "io.onedev.commons.bootstrap.Bootstrap");- wrapperConf = StringUtils.replace(wrapperConf, "wrapper.pidfile=../status/onedev.pid", "");- wrapperConf = StringUtils.replace(wrapperConf, "-XX:+IgnoreUnrecognizedVMOptions",- "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED");- if (!wrapperConf.contains("java.base/jdk.internal.ref=ALL-UNNAMED")) {- wrapperConf += ""- + "\r\nwrapperConfwrapper.java.additional.30=--add-modules=java.se"- + "\r\nwrapper.java.additional.31=--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED"- + "\r\nwrapper.java.additional.32=--add-opens=java.management/sun.management=ALL-UNNAMED"- + "\r\nwrapper.java.additional.33=--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED";- }-- if (!wrapperConf.contains("wrapper.disable_console_input"))- wrapperConf += "\r\nwrapper.disable_console_input=TRUE";-- FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, StandardCharsets.UTF_8);-- File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");- String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, StandardCharsets.UTF_8);- hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.autoCommit=false",- "hibernate.hikari.autoCommit=true");- hibernateProps = StringUtils.replace(hibernateProps, "GitPlex", "OneDev");- hibernateProps = StringUtils.replace(hibernateProps, "TurboDev", "OneDev");-- if (!hibernateProps.contains("hsqldb.lob_file_scale")) {- hibernateProps = StringUtils.replace(hibernateProps, "sampledb/onedev;",- "sampledb/onedev;hsqldb.lob_file_scale=4;");- }-- if (!hibernateProps.contains("hibernate.connection.autocommit=true")) {- hibernateProps = StringUtils.replace(hibernateProps,- "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider",- "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider\r\n"- + "hibernate.connection.autocommit=true");- }-- hibernateProps = StringUtils.replace(hibernateProps, "hibernate.connection.autocommit=true", "");- hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.leakDetectionThreshold=1800000", "");- hibernateProps = StringUtils.replace(hibernateProps, "org.hibernate.cache.ehcache.EhCacheRegionFactory",- "com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory");- hibernateProps = StringUtils.replace(hibernateProps, "org.hibernate.cache.jcache.JCacheRegionFactory",- "com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory");- if (!hibernateProps.contains("hibernate.cache.auto_evict_collection_cache=true")) {- hibernateProps += "hibernate.cache.auto_evict_collection_cache=true\r\n";- hibernateProps += "hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider\r\n";- hibernateProps += "hibernate.javax.cache.missing_cache_strategy=create\r\n";- }- hibernateProps = StringUtils.replace(hibernateProps,- "hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider",- "");- hibernateProps = StringUtils.replace(hibernateProps,- "hibernate.javax.cache.missing_cache_strategy=create",- "");-- FileUtils.writeStringToFile(hibernatePropsFile, hibernateProps, StandardCharsets.UTF_8);-- File serverPropsFile = new File(upgradeDir, "conf/server.properties");- String serverProps = FileUtils.readFileToString(serverPropsFile, StandardCharsets.UTF_8);- if (serverProps.contains("sessionTimeout"))- FileUtils.copyFile(new File(Bootstrap.getConfDir(), "server.properties"), serverPropsFile);- serverProps = FileUtils.readFileToString(serverPropsFile, StandardCharsets.UTF_8);- if (!serverProps.contains("ssh_port")) {- serverProps += String.format("%n%nssh_port: 6611%n");- FileUtils.writeStringToFile(serverPropsFile, serverProps, StandardCharsets.UTF_8);- }-- File logbackConfigFile = new File(upgradeDir, "conf/logback.xml");- String logbackConfig = FileUtils.readFileToString(logbackConfigFile, StandardCharsets.UTF_8);- if (!logbackConfig.contains("AggregatedServiceLoader")- || !logbackConfig.contains("com.hazelcast.cp.CPSubsystem")) {- FileUtils.copyFile(new File(Bootstrap.getConfDir(), "logback.xml"), logbackConfigFile);- }-- File sampleKeystoreFile = new File(upgradeDir, "conf/sample.keystore");- if (sampleKeystoreFile.exists())- FileUtils.deleteFile(sampleKeystoreFile);-- logbackConfigFile = new File(upgradeDir, "conf/logback.xml");- logbackConfig = FileUtils.readFileToString(logbackConfigFile, StandardCharsets.UTF_8);- logbackConfig = StringUtils.replace(logbackConfig,- "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"/>",- "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"><maxFileSize>1MB</maxFileSize></triggeringPolicy>");- logbackConfig = StringUtils.replace(logbackConfig, "gitplex", "turbodev");- logbackConfig = StringUtils.replace(logbackConfig, "com.turbodev", "io.onedev");- logbackConfig = StringUtils.replace(logbackConfig, "turbodev", "onedev");-- if (!logbackConfig.contains("MaskingPatternLayout")) {- logbackConfig = StringUtils.replace(logbackConfig,- "ch.qos.logback.classic.encoder.PatternLayoutEncoder",- "ch.qos.logback.core.encoder.LayoutWrappingEncoder");- logbackConfig = StringUtils.replace(logbackConfig,- "<pattern>",- "<layout class=\"io.onedev.commons.bootstrap.MaskingPatternLayout\">\n <pattern>");- logbackConfig = StringUtils.replace(logbackConfig,- "</pattern>",- "</pattern>\n </layout>");- }-- FileUtils.writeStringToFile(logbackConfigFile, logbackConfig, StandardCharsets.UTF_8);-- FileUtils.copyFile(new File(Bootstrap.installDir, "conf/wrapper-license.conf"),- new File(upgradeDir, "conf/wrapper-license.conf"));- FileUtils.copyFile(new File(Bootstrap.installDir, "readme.txt"), new File(upgradeDir, "readme.txt"));- FileUtils.copyFile(new File(Bootstrap.installDir, "license.txt"), new File(upgradeDir, "license.txt"));- FileUtils.copyFile(new File(Bootstrap.installDir, RELEASE_PROPS_FILE), new File(upgradeDir, RELEASE_PROPS_FILE));-- FileUtils.createDir(new File(Bootstrap.installDir, INCOMPATIBILITIES).getParentFile());- if (new File(upgradeDir, INCOMPATIBILITIES_SINCE_UPGRADED_VERSION).exists())- FileUtils.deleteFile(new File(upgradeDir, INCOMPATIBILITIES_SINCE_UPGRADED_VERSION));- if (new File(upgradeDir, CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION).exists())- FileUtils.deleteFile(new File(upgradeDir, CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION));- List<String> incompatibilities = FileUtils.readLines(- new File(Bootstrap.installDir, INCOMPATIBILITIES), StandardCharsets.UTF_8);- if (new File(upgradeDir, INCOMPATIBILITIES).exists()) {- String lastIncompatibilityVersion = null;- for (var line: FileUtils.readLines(new File(upgradeDir, INCOMPATIBILITIES), StandardCharsets.UTF_8)) {- if (line.trim().startsWith("# ")) {- lastIncompatibilityVersion = line.trim().substring(1).trim();- break;- }- }-- if (lastIncompatibilityVersion != null) {- var incompatibilitiesSinceUpgradedVersion = new ArrayList<>();- for (var line: incompatibilities) {- if (line.trim().startsWith("# ")- && line.trim().substring(1).trim().equals(lastIncompatibilityVersion)) {- break;- } else {- incompatibilitiesSinceUpgradedVersion.add(line);- }- }- if (!incompatibilitiesSinceUpgradedVersion.isEmpty()) {- FileUtils.writeFile(- new File(upgradeDir, INCOMPATIBILITIES_SINCE_UPGRADED_VERSION),- Joiner.on("\n").join(incompatibilitiesSinceUpgradedVersion));- }- }- }- FileUtils.copyFile(new File(Bootstrap.installDir, INCOMPATIBILITIES),- new File(upgradeDir, INCOMPATIBILITIES));- } catch (IOException e) {- throw new RuntimeException(e);- }- restoreExecutables(upgradeDir);- }-- protected void cleanAndCopy(File srcDir, File destDir) {- try {- FileUtils.cleanDir(destDir);- FileUtils.copyDirectory(srcDir, destDir);- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- private void restoreExecutables(File installDir) {- for (File file: new File(installDir, "bin").listFiles()) {- if (file.getName().endsWith(".sh"))- file.setExecutable(true);- }- for (File file: new File(installDir, "boot").listFiles()) {- if (file.getName().startsWith("wrapper-"))- file.setExecutable(true);- }- }-- @Override- public void stop() {- }--}+package io.onedev.server.commandhandler;++import static org.hibernate.cfg.AvailableSettings.DIALECT;++import java.io.File;+import java.io.IOException;+import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;+import java.util.ArrayList;+import java.util.List;+import java.util.Properties;+import java.util.concurrent.atomic.AtomicInteger;++import javax.inject.Singleton;++import org.apache.commons.lang3.SystemUtils;+import org.joda.time.DateTime;+import org.joda.time.format.DateTimeFormat;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.base.Joiner;++import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.loader.AbstractPlugin;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.command.Commandline;+import io.onedev.commons.utils.command.LineConsumer;+import io.onedev.server.OneDev;+import io.onedev.server.migration.DataMigrator;+import io.onedev.server.migration.MigrationHelper;+import io.onedev.server.persistence.HibernateConfig;+import io.onedev.server.security.SecurityUtils;++@Singleton+public class Upgrade extends AbstractPlugin {++ public static final String COMMAND = "upgrade";++ private static final Logger logger = LoggerFactory.getLogger(Upgrade.class);++ public static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";++ public static final String DB_BACKUP_DIR = "db-backup";++ private static final String RELEASE_PROPS_FILE = "release.properties";++ public static final String INCOMPATIBILITIES = "incompatibilities/incompatibilities.md";++ public static final String INCOMPATIBILITIES_SINCE_UPGRADED_VERSION = "incompatibilities/since-upgraded-version.md";++ public static final String CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION = "incompatibilities/checked-since-upgraded-version.md";++ protected Commandline buildCommandline(File upgradeDir, String command, String...commandArgs) {+ String version = loadReleaseProps(new File(upgradeDir, RELEASE_PROPS_FILE)).getProperty("version");++ if (version == null) {+ File versionFile = new File(upgradeDir, "version.txt");+ if (versionFile.exists()) {+ try {+ version = FileUtils.readFileToString(versionFile, Charset.defaultCharset()).trim();+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }++ if (version == null)+ version = "1.0-EAP-build26";++ String bootstrapClass;+ if (version.startsWith("1.0-EAP")) {+ int build = Integer.parseInt(StringUtils.substringAfterLast(version, "build"));+ if (build <= 26)+ bootstrapClass = "com.gitplex.commons.bootstrap.Bootstrap";+ else+ bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";+ } else if (version.startsWith("1.0.0")) {+ bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";+ } else if (version.startsWith("1.0.1")) {+ bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap";+ } else if (version.startsWith("2.0.")) {+ bootstrapClass = "io.onedev.launcher.bootstrap.Bootstrap";+ } else if (version.startsWith("3.") || version.startsWith("4.0.") || version.startsWith("4.1.")+ || version.startsWith("4.2.") || version.startsWith("4.3.") || version.startsWith("4.4.")+ || version.startsWith("4.5.") || version.startsWith("4.6.") || version.startsWith("4.7.")+ || version.startsWith("4.8.") || version.startsWith("4.9.")) {+ bootstrapClass = "io.onedev.commons.launcher.bootstrap.Bootstrap";+ } else {+ bootstrapClass = "io.onedev.commons.bootstrap.Bootstrap";+ }++ if (version.startsWith("1.") || version.startsWith("2.")) {+ switch (command) {+ case "check-data-version":+ command = "check_data_version";+ break;+ case "backup-db":+ command = "backup";+ break;+ case "clean-db":+ command = "clean";+ break;+ }+ }+ Commandline cmdline= new Commandline(System.getProperty("java.home") + "/bin/java");+ cmdline.addArgs(+ "-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m",+ "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",+ "--add-opens=java.base/java.lang=ALL-UNNAMED",+ "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",+ "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",+ "--add-opens=java.base/java.util=ALL-UNNAMED",+ "--add-opens=java.base/java.text=ALL-UNNAMED",+ "--add-opens=java.desktop/java.awt.font=ALL-UNNAMED",+ "--add-modules=java.se",+ "--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED",+ "--add-opens=java.management/sun.management=ALL-UNNAMED",+ "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED",+ "-classpath", "*", bootstrapClass,+ command);+ cmdline.addArgs(commandArgs);+ cmdline.workingDir(new File(upgradeDir, "boot"));+ return cmdline;+ }++ private String prefixUpgradeTargetLog(String line) {+ return ">>> " + line;+ }++ private String getDialect(File installDir) {+ String dialect = System.getenv(DIALECT.replace('.', '_'));+ if (dialect == null) {+ File file = new File(installDir, "conf/hibernate.properties");+ dialect = FileUtils.loadProperties(file).getProperty(DIALECT);+ }+ return dialect;+ }++ private Properties loadReleaseProps(File releasePropsFile) {+ if (releasePropsFile.exists())+ return FileUtils.loadProperties(releasePropsFile);+ else+ return new Properties();+ }++ @Override+ public void start() {+ SecurityUtils.bindAsSystem();++ if (Bootstrap.command.getArgs().length == 0) {+ logger.error("Missing upgrade target parameter. Usage: {} <OneDev installation directory>",+ Bootstrap.command.getScript());+ System.exit(1);+ }++ File upgradeDir = new File(Bootstrap.command.getArgs()[0]);+ if (!upgradeDir.isAbsolute() && System.getenv("WRAPPER_INIT_DIR") != null)+ upgradeDir = new File(System.getenv("WRAPPER_INIT_DIR"), upgradeDir.getPath());++ if (!upgradeDir.exists()) {+ logger.error("Unable to find directory: {}", upgradeDir.getAbsolutePath());+ System.exit(1);+ } else if (!upgradeDir.isDirectory()) {+ logger.error("A directory is expected: {}", upgradeDir.getAbsolutePath());+ System.exit(1);+ }++ boolean isEmpty = true;+ for (File file: upgradeDir.listFiles()) {+ if (!file.getName().equals("lost+found") && !file.getName().equals("site")) {+ isEmpty = false;+ break;+ }+ }+ if (!isEmpty) {+ if (!new File(upgradeDir, "boot").exists()) {+ logger.error("Invalid OneDev installation directory: {}, make sure you are specifying the top level "+ + "installation directory (it contains sub directories such as \"bin\", \"boot\", \"conf\", etc)",+ upgradeDir.getAbsolutePath());+ System.exit(1);+ }++ Properties releaseProps = loadReleaseProps(new File(Bootstrap.installDir, RELEASE_PROPS_FILE));+ Properties oldReleaseProps = loadReleaseProps(new File(upgradeDir, RELEASE_PROPS_FILE));++ if (!releaseProps.equals(oldReleaseProps)) {+ logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());++ if (OneDev.isServerRunning(upgradeDir) || OneDev.isServerRunning(Bootstrap.installDir)) {+ logger.error("Please stop server before upgrading");+ System.exit(1);+ }++ for (File file: new File(upgradeDir, "lib").listFiles()) {+ if (file.getName().contains("mariadb") || file.getName().contains("mysql")+ || file.getName().contains("ojdbc") || file.getName().contains("postgresql")+ || file.getName().contains("sqljdbc")) {+ try {+ File destDir = new File(upgradeDir, "site/lib");+ FileUtils.createDir(destDir);+ FileUtils.copyFileToDirectory(file, destDir);+ FileUtils.deleteFile(file);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }++ File statusDir = new File(upgradeDir, "status");+ if (statusDir.exists())+ FileUtils.cleanDir(statusDir);++ AtomicInteger oldDataVersion = new AtomicInteger(0);++ int ret = buildCommandline(upgradeDir, "check-data-version").execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ String prefix = "Data version: ";+ if (line.startsWith(prefix)) {+ oldDataVersion.set(Integer.parseInt(line.substring(prefix.length())));+ logger.info("Old data version: " + oldDataVersion.get());+ } else {+ logger.info(prefixUpgradeTargetLog(line));+ }+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.error(prefixUpgradeTargetLog(line));+ }}++ ).getReturnCode();++ if (ret != 0) {+ logger.error("Unable to upgrade specified installation due to above error");+ System.exit(1);+ }++ int newDataVersion = Integer.parseInt(MigrationHelper.getVersion(DataMigrator.class));++ if (oldDataVersion.get() > newDataVersion) {+ logger.error("App is too old, please use a newer version");+ System.exit(1);+ }++ String timestamp = DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime());+ File programBackup = new File(upgradeDir, "site/program-backup/" + timestamp);+ FileUtils.createDir(programBackup);++ logger.info("Backing up old program files as {}...", programBackup.getAbsolutePath());+ try {+ for (File each: upgradeDir.listFiles()) {+ if (each.isFile())+ FileUtils.copyFileToDirectory(each, programBackup);+ else if (!each.getName().equals("temp") && !each.getName().equals("site") && !each.getName().equals("sampledb"))+ FileUtils.copyDirectoryToDirectory(each, programBackup);+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ restoreExecutables(programBackup);++ File dbBackupFile = new File(upgradeDir, "site/" + DB_BACKUP_DIR + "/" + timestamp + ".zip");+ boolean failed = false;+ boolean dbChanged = false;+ boolean dbCleaned = false;+ try {+ if (oldDataVersion.get() != newDataVersion) {+ logger.info("Backing up database as {}...", dbBackupFile.getAbsolutePath());++ FileUtils.createDir(dbBackupFile.getParentFile());++ ret = buildCommandline(upgradeDir, "backup-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.info(prefixUpgradeTargetLog(line));+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.error(prefixUpgradeTargetLog(line));+ }++ }).getReturnCode();++ if (ret == 0) {+ dbChanged = true;+ if (HibernateConfig.isHSQLDialect(getDialect(upgradeDir))) {+ FileUtils.deleteDir(new File(upgradeDir, "sampledb"), 3);+ } else {+ logger.info("Cleaning database with old program...");++ ret = buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.info(prefixUpgradeTargetLog(line));+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.error(prefixUpgradeTargetLog(line));+ }++ }).getReturnCode();+ }+ if (ret == 0)+ dbCleaned = true;+ }++ if (ret == 0) {+ logger.info("Updating program files...");+ updateProgramFiles(upgradeDir, oldDataVersion.get());++ dbCleaned = false;+ logger.info("Restoring database with new program...");+ ret = buildCommandline(upgradeDir, "restore-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.info(prefixUpgradeTargetLog(line));+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.error(prefixUpgradeTargetLog(line));+ }++ }).getReturnCode();+ }++ if (ret != 0) {+ logger.error("Failed to upgrade {}", upgradeDir.getAbsolutePath());+ failed = true;+ }+ } else {+ logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());+ updateProgramFiles(upgradeDir, oldDataVersion.get());+ }+ } catch (Exception e) {+ logger.error("Error upgrading " + upgradeDir.getAbsolutePath(), e);+ failed = true;+ }++ if (failed) {+ if (dbChanged && !dbCleaned) {+ logger.info("Cleaning database with new program...");+ try {+ buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.info(prefixUpgradeTargetLog(line));+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.error(prefixUpgradeTargetLog(line));+ }++ }).checkReturnCode();++ dbCleaned = true;+ } catch (Exception e) {+ logger.error("Error cleaning database", e);+ }+ }++ boolean programRestored = false;+ logger.info("Restoring old program files...");+ try {+ for (File child: programBackup.listFiles()) {+ if (!child.getName().equals("site")) {+ File target = new File(upgradeDir, child.getName());+ if (target.isDirectory()) {+ FileUtils.cleanDir(target);+ FileUtils.copyDirectory(child, target);+ } else {+ FileUtils.copyFile(child, target);+ }+ }+ }++ if (oldDataVersion.get() <= 102)+ FileUtils.createDir(new File(upgradeDir, "site/assets/root"));++ restoreExecutables(upgradeDir);+ FileUtils.deleteDir(programBackup);++ logger.info("Old program files restored");+ programRestored = true;+ } catch (Exception e) {+ logger.error("Error restoring old program files", e);+ logger.warn("Please restore manually from \"{}\"", programBackup.getAbsolutePath());+ }++ if (programRestored && dbChanged && dbCleaned) {+ logger.info("Restoring old database...");+ try {+ buildCommandline(upgradeDir, "restore-db", dbBackupFile.getAbsolutePath(), "false").execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.info(prefixUpgradeTargetLog(line));+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.error(prefixUpgradeTargetLog(line));+ }++ }).checkReturnCode();++ logger.info("Old database restored");+ dbChanged = false;+ } catch (Exception e) {+ logger.error("Error restoring old database", e);+ }+ }++ logger.error("!!!!!!!!! Failed to upgrade {} !!!!!!!!!!!", upgradeDir.getAbsolutePath());+ if (dbChanged) {+ logger.warn("OneDev is unable to restore old database, please do it manually by first resetting it (delete and create), and then running below command:");+ if (SystemUtils.IS_OS_WINDOWS) {+ logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore-db.bat " + dbBackupFile.getAbsolutePath());+ } else {+ logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore-db.sh " + dbBackupFile.getAbsolutePath());+ }+ }+ System.exit(1);+ } else {+ logger.info("********** Successfully upgraded {} **********", upgradeDir.getAbsolutePath());++ if (oldDataVersion.get() <= 5) {+ logger.warn("\n"+ + "************************* IMPORTANT NOTICE *************************\n"+ + "* OneDev password hash algorithm has been changed for security *\n"+ + "* reason. Please reset administrator password with the *\n"+ + "* reset_admin_password command. Other users' password will be *\n"+ + "* reset and sent to their mail box automatically when they logs *\n"+ + "* into OneDev. *\n"+ + "********************************************************************");+ }+ FileUtils.deleteDir(programBackup);+ System.exit(0);+ }+ } else {+ logger.info("*********** Successfully checked {} ************", upgradeDir.getAbsolutePath());+ System.exit(0);+ }+ } else {+ logger.info("Populating {}...", upgradeDir.getAbsolutePath());++ if (OneDev.isServerRunning(Bootstrap.installDir)) {+ logger.error("Please stop server before populating");+ System.exit(1);+ }++ try {+ FileUtils.copyDirectory(Bootstrap.installDir, upgradeDir);+ FileUtils.cleanDir(new File(upgradeDir, "logs"));+ restoreExecutables(upgradeDir);+ logger.info("*********** Successfully populated {} ************", upgradeDir.getAbsolutePath());+ System.exit(0);+ } catch (Exception e) {+ logger.error("!!!!!!! Error populating " + upgradeDir.getAbsolutePath() + " !!!!!!!!", e);+ FileUtils.cleanDir(upgradeDir);+ System.exit(1);+ }+ }+ }++ protected void updateProgramFiles(File upgradeDir, int oldDataVersion) {+ cleanAndCopy(new File(Bootstrap.installDir, "3rdparty-licenses"), new File(upgradeDir, "3rdparty-licenses"));++ File siteServerScriptFile = new File(upgradeDir, "bin/server.sh");+ for (File file: Bootstrap.getBinDir().listFiles()) {+ if (!file.getName().endsWith(".pid") && !file.getName().endsWith(".status")) {+ try {+ String serverScript = null;+ if (file.getName().equals("server.sh")) {+ serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());++ String siteRunAsUserLine = null;+ for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {+ if (line.contains("RUN_AS_USER")) {+ siteRunAsUserLine = line;+ break;+ }+ }+ if (siteRunAsUserLine != null) {+ String runAsUserLine = null;+ for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {+ if (line.contains("RUN_AS_USER")) {+ runAsUserLine = line;+ break;+ }+ }+ if (runAsUserLine != null)+ serverScript = StringUtils.replace(serverScript, runAsUserLine, siteRunAsUserLine);+ }++ String siteFilesToSourceLine = null;+ for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {+ if (line.contains("FILES_TO_SOURCE") && !line.startsWith("#")) {+ siteFilesToSourceLine = line;+ break;+ }+ }+ if (siteFilesToSourceLine != null) {+ String filesToSourceLine = null;+ for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {+ if (line.contains("FILES_TO_SOURCE") && !line.startsWith("#")) {+ filesToSourceLine = line;+ break;+ }+ }+ if (filesToSourceLine != null)+ serverScript = StringUtils.replace(serverScript, filesToSourceLine, siteFilesToSourceLine);+ }+ }+ if (serverScript != null)+ FileUtils.writeStringToFile(siteServerScriptFile, serverScript, Charset.defaultCharset());+ else+ FileUtils.copyFile(file, new File(upgradeDir, "bin/" + file.getName()));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }++ if (new File(upgradeDir, "bin/apply_db_constraints.bat").exists())+ FileUtils.deleteFile(new File(upgradeDir, "bin/apply_db_constraints.bat"));+ if (new File(upgradeDir, "bin/apply_db_constraints.sh").exists())+ FileUtils.deleteFile(new File(upgradeDir, "bin/apply_db_constraints.sh"));+ if (new File(upgradeDir, "bin/backup.bat").exists())+ FileUtils.deleteFile(new File(upgradeDir, "bin/backup.bat"));+ if (new File(upgradeDir, "bin/backup.sh").exists())+ FileUtils.deleteFile(new File(upgradeDir, "bin/backup.sh"));+ if (new File(upgradeDir, "bin/restore.bat").exists())+ FileUtils.deleteFile(new File(upgradeDir, "bin/restore.bat"));+ if (new File(upgradeDir, "bin/restore.sh").exists())+ FileUtils.deleteFile(new File(upgradeDir, "bin/restore.sh"));+ if (new File(upgradeDir, "bin/reset_admin_password.bat").exists())+ FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.bat"));+ if (new File(upgradeDir, "bin/reset_admin_password.sh").exists())+ FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.sh"));++ FileUtils.deleteDir(new File(upgradeDir, "status"));++ cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));+ cleanAndCopy(new File(Bootstrap.installDir, "agent"), new File(upgradeDir, "agent"));++ cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));++ FileUtils.createDir(new File(upgradeDir, "site/assets"));+ if (new File(upgradeDir, "site/robots.txt").exists()) {+ try {+ FileUtils.copyFile(+ new File(upgradeDir, "site/robots.txt"),+ new File(upgradeDir, "site/assets/robots.txt"));+ FileUtils.deleteFile(new File(upgradeDir, "site/robots.txt"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ if (new File(upgradeDir, "site/logo.png").exists()) {+ try {+ FileUtils.copyFile(+ new File(upgradeDir, "site/logo.png"),+ new File(upgradeDir, "site/assets/logo.png"));+ FileUtils.deleteFile(new File(upgradeDir, "site/logo.png"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ if (new File(upgradeDir, "site/avatars").exists()) {+ try {+ FileUtils.copyDirectory(+ new File(upgradeDir, "site/avatars"),+ new File(upgradeDir, "site/assets/avatars"));+ FileUtils.deleteDir(new File(upgradeDir, "site/avatars"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ for (File file: new File(Bootstrap.getSiteDir(), "assets/avatars").listFiles()) {+ if (file.isFile()) {+ try {+ FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/assets/avatars"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }+ File uploadedDir = new File(upgradeDir, "site/assets/avatars/uploaded");+ File userUploadsDir = new File(uploadedDir, "users");+ if (uploadedDir.exists() && !userUploadsDir.exists()) {+ FileUtils.createDir(userUploadsDir);+ for (File file: uploadedDir.listFiles()) {+ if (file.isFile()) {+ try {+ FileUtils.moveFileToDirectory(file, userUploadsDir, false);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }+ }++ if (oldDataVersion <= 102) {+ File assetsRootDir = new File(upgradeDir, "site/assets/root");+ FileUtils.createDir(assetsRootDir);+ if (new File(upgradeDir, "site/assets/robots.txt").exists()) {+ try {+ FileUtils.copyFile(+ new File(upgradeDir, "site/assets/robots.txt"),+ new File(assetsRootDir, "robots.txt"));+ FileUtils.deleteFile(new File(upgradeDir, "site/assets/robots.txt"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ for (File file: assetsRootDir.listFiles()) {+ try {+ FileUtils.moveToDirectory(file, new File(upgradeDir, "site/assets"), true);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ FileUtils.deleteDir(assetsRootDir);++ File usersDir = new File(upgradeDir, "site/users");+ if (usersDir.exists()) {+ for (File file: usersDir.listFiles()) {+ File oldVisitInfoDir = new File(file, "info");+ File projectDir = new File(upgradeDir, "site/projects/" + file.getName());+ if (oldVisitInfoDir.exists() && projectDir.exists()) {+ File newVisitInfoDir = new File(projectDir, "info/visit");+ FileUtils.createDir(newVisitInfoDir.getParentFile());+ FileUtils.deleteDir(newVisitInfoDir);+ try {+ FileUtils.moveDirectory(oldVisitInfoDir, newVisitInfoDir);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }+ FileUtils.deleteDir(usersDir);+ }+ FileUtils.deleteDir(new File(upgradeDir, "site/info"));+ }++ try {+ File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");+ String wrapperConf = FileUtils.readFileToString(wrapperConfFile, StandardCharsets.UTF_8);+ wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap",+ "io.onedev.commons.launcher.bootstrap.Bootstrap");+ wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap",+ "io.onedev.commons.launcher.bootstrap.Bootstrap");+ wrapperConf = StringUtils.replace(wrapperConf, "com.turbodev.launcher.bootstrap.Bootstrap",+ "io.onedev.commons.launcher.bootstrap.Bootstrap");+ wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.launcher.bootstrap.Bootstrap",+ "io.onedev.commons.launcher.bootstrap.Bootstrap");+ wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.commons.launcher.bootstrap.Bootstrap",+ "io.onedev.commons.bootstrap.Bootstrap");+ wrapperConf = StringUtils.replace(wrapperConf, "wrapper.pidfile=../status/onedev.pid", "");+ wrapperConf = StringUtils.replace(wrapperConf, "-XX:+IgnoreUnrecognizedVMOptions",+ "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED");+ if (!wrapperConf.contains("java.base/jdk.internal.ref=ALL-UNNAMED")) {+ wrapperConf += ""+ + "\r\nwrapperConfwrapper.java.additional.30=--add-modules=java.se"+ + "\r\nwrapper.java.additional.31=--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED"+ + "\r\nwrapper.java.additional.32=--add-opens=java.management/sun.management=ALL-UNNAMED"+ + "\r\nwrapper.java.additional.33=--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED";+ }++ if (!wrapperConf.contains("wrapper.disable_console_input"))+ wrapperConf += "\r\nwrapper.disable_console_input=TRUE";++ FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, StandardCharsets.UTF_8);++ File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");+ String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, StandardCharsets.UTF_8);+ hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.autoCommit=false",+ "hibernate.hikari.autoCommit=true");+ hibernateProps = StringUtils.replace(hibernateProps, "GitPlex", "OneDev");+ hibernateProps = StringUtils.replace(hibernateProps, "TurboDev", "OneDev");++ if (!hibernateProps.contains("hsqldb.lob_file_scale")) {+ hibernateProps = StringUtils.replace(hibernateProps, "sampledb/onedev;",+ "sampledb/onedev;hsqldb.lob_file_scale=4;");+ }++ if (!hibernateProps.contains("hibernate.connection.autocommit=true")) {+ hibernateProps = StringUtils.replace(hibernateProps,+ "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider",+ "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider\r\n"+ + "hibernate.connection.autocommit=true");+ }++ hibernateProps = StringUtils.replace(hibernateProps, "hibernate.connection.autocommit=true", "");+ hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.leakDetectionThreshold=1800000", "");+ hibernateProps = StringUtils.replace(hibernateProps, "org.hibernate.cache.ehcache.EhCacheRegionFactory",+ "com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory");+ hibernateProps = StringUtils.replace(hibernateProps, "org.hibernate.cache.jcache.JCacheRegionFactory",+ "com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory");+ if (!hibernateProps.contains("hibernate.cache.auto_evict_collection_cache=true")) {+ hibernateProps += "hibernate.cache.auto_evict_collection_cache=true\r\n";+ hibernateProps += "hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider\r\n";+ hibernateProps += "hibernate.javax.cache.missing_cache_strategy=create\r\n";+ }+ hibernateProps = StringUtils.replace(hibernateProps,+ "hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider",+ "");+ hibernateProps = StringUtils.replace(hibernateProps,+ "hibernate.javax.cache.missing_cache_strategy=create",+ "");++ FileUtils.writeStringToFile(hibernatePropsFile, hibernateProps, StandardCharsets.UTF_8);++ File serverPropsFile = new File(upgradeDir, "conf/server.properties");+ String serverProps = FileUtils.readFileToString(serverPropsFile, StandardCharsets.UTF_8);+ if (serverProps.contains("sessionTimeout"))+ FileUtils.copyFile(new File(Bootstrap.getConfDir(), "server.properties"), serverPropsFile);+ serverProps = FileUtils.readFileToString(serverPropsFile, StandardCharsets.UTF_8);+ if (!serverProps.contains("ssh_port")) {+ serverProps += String.format("%n%nssh_port: 6611%n");+ FileUtils.writeStringToFile(serverPropsFile, serverProps, StandardCharsets.UTF_8);+ }++ File logbackConfigFile = new File(upgradeDir, "conf/logback.xml");+ String logbackConfig = FileUtils.readFileToString(logbackConfigFile, StandardCharsets.UTF_8);+ if (!logbackConfig.contains("AggregatedServiceLoader")+ || !logbackConfig.contains("com.hazelcast.cp.CPSubsystem")) {+ FileUtils.copyFile(new File(Bootstrap.getConfDir(), "logback.xml"), logbackConfigFile);+ }++ File sampleKeystoreFile = new File(upgradeDir, "conf/sample.keystore");+ if (sampleKeystoreFile.exists())+ FileUtils.deleteFile(sampleKeystoreFile);++ logbackConfigFile = new File(upgradeDir, "conf/logback.xml");+ logbackConfig = FileUtils.readFileToString(logbackConfigFile, StandardCharsets.UTF_8);+ logbackConfig = StringUtils.replace(logbackConfig,+ "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"/>",+ "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"><maxFileSize>1MB</maxFileSize></triggeringPolicy>");+ logbackConfig = StringUtils.replace(logbackConfig, "gitplex", "turbodev");+ logbackConfig = StringUtils.replace(logbackConfig, "com.turbodev", "io.onedev");+ logbackConfig = StringUtils.replace(logbackConfig, "turbodev", "onedev");++ if (!logbackConfig.contains("MaskingPatternLayout")) {+ logbackConfig = StringUtils.replace(logbackConfig,+ "ch.qos.logback.classic.encoder.PatternLayoutEncoder",+ "ch.qos.logback.core.encoder.LayoutWrappingEncoder");+ logbackConfig = StringUtils.replace(logbackConfig,+ "<pattern>",+ "<layout class=\"io.onedev.commons.bootstrap.MaskingPatternLayout\">\n <pattern>");+ logbackConfig = StringUtils.replace(logbackConfig,+ "</pattern>",+ "</pattern>\n </layout>");+ }++ FileUtils.writeStringToFile(logbackConfigFile, logbackConfig, StandardCharsets.UTF_8);++ FileUtils.copyFile(new File(Bootstrap.installDir, "conf/wrapper-license.conf"),+ new File(upgradeDir, "conf/wrapper-license.conf"));+ FileUtils.copyFile(new File(Bootstrap.installDir, "readme.txt"), new File(upgradeDir, "readme.txt"));+ FileUtils.copyFile(new File(Bootstrap.installDir, "license.txt"), new File(upgradeDir, "license.txt"));+ FileUtils.copyFile(new File(Bootstrap.installDir, RELEASE_PROPS_FILE), new File(upgradeDir, RELEASE_PROPS_FILE));++ FileUtils.createDir(new File(Bootstrap.installDir, INCOMPATIBILITIES).getParentFile());+ if (new File(upgradeDir, INCOMPATIBILITIES_SINCE_UPGRADED_VERSION).exists())+ FileUtils.deleteFile(new File(upgradeDir, INCOMPATIBILITIES_SINCE_UPGRADED_VERSION));+ if (new File(upgradeDir, CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION).exists())+ FileUtils.deleteFile(new File(upgradeDir, CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION));+ List<String> incompatibilities = FileUtils.readLines(+ new File(Bootstrap.installDir, INCOMPATIBILITIES), StandardCharsets.UTF_8);+ if (new File(upgradeDir, INCOMPATIBILITIES).exists()) {+ String lastIncompatibilityVersion = null;+ for (var line: FileUtils.readLines(new File(upgradeDir, INCOMPATIBILITIES), StandardCharsets.UTF_8)) {+ if (line.trim().startsWith("# ")) {+ lastIncompatibilityVersion = line.trim().substring(1).trim();+ break;+ }+ }++ if (lastIncompatibilityVersion != null) {+ var incompatibilitiesSinceUpgradedVersion = new ArrayList<>();+ for (var line: incompatibilities) {+ if (line.trim().startsWith("# ")+ && line.trim().substring(1).trim().equals(lastIncompatibilityVersion)) {+ break;+ } else {+ incompatibilitiesSinceUpgradedVersion.add(line);+ }+ }+ if (!incompatibilitiesSinceUpgradedVersion.isEmpty()) {+ FileUtils.writeFile(+ new File(upgradeDir, INCOMPATIBILITIES_SINCE_UPGRADED_VERSION),+ Joiner.on("\n").join(incompatibilitiesSinceUpgradedVersion));+ }+ }+ }+ FileUtils.copyFile(new File(Bootstrap.installDir, INCOMPATIBILITIES),+ new File(upgradeDir, INCOMPATIBILITIES));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ restoreExecutables(upgradeDir);+ }++ protected void cleanAndCopy(File srcDir, File destDir) {+ try {+ FileUtils.cleanDir(destDir);+ FileUtils.copyDirectory(srcDir, destDir);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ private void restoreExecutables(File installDir) {+ for (File file: new File(installDir, "bin").listFiles()) {+ if (file.getName().endsWith(".sh"))+ file.setExecutable(true);+ }+ for (File file: new File(installDir, "boot").listFiles()) {+ if (file.getName().startsWith("wrapper-"))+ file.setExecutable(true);+ }+ }++ @Override+ public void stop() {+ }++}diff --git a/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.javaindex 5870613282..b9baebb21a 100644--- a/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/hook/GitPostReceiveCallback.java@@ -1,177 +1,177 @@-package io.onedev.server.git.hook;--import java.io.IOException;-import java.util.ArrayList;-import java.util.Enumeration;-import java.util.List;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;--import org.apache.commons.lang3.tuple.ImmutableTriple;-import org.apache.commons.lang3.tuple.Triple;-import org.apache.shiro.util.ThreadContext;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.RefUpdate;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.RevWalk;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.base.Preconditions;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.UrlManager;-import io.onedev.server.event.ListenerRegistry;-import io.onedev.server.event.project.RefUpdated;-import io.onedev.server.git.GitUtils;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.security.SecurityUtils;--@SuppressWarnings("serial")-@Singleton-public class GitPostReceiveCallback extends HttpServlet {-- private static final Logger logger = LoggerFactory.getLogger(GitPostReceiveCallback.class);-- public static final String PATH = "/git-postreceive-callback";-- private final ProjectManager projectManager;-- private final UrlManager urlManager;-- private final SessionManager sessionManager;-- private final ListenerRegistry listenerRegistry;-- @Inject- public GitPostReceiveCallback(ProjectManager projectManager, UrlManager urlManager,- SessionManager sessionManager, ListenerRegistry listenerRegistry) {- this.projectManager = projectManager;- this.urlManager = urlManager;- this.sessionManager = sessionManager;- this.listenerRegistry = listenerRegistry;- }-- @Sessional- @Override- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {- List<String> fields = StringUtils.splitAndTrim(request.getPathInfo(), "/");- Preconditions.checkState(fields.size() == 3);-- if (!fields.get(2).equals(HookUtils.HOOK_TOKEN)) {- response.sendError(HttpServletResponse.SC_FORBIDDEN,- "Git hook callbacks can only be accessed by OneDev itself");- return;- }- Long userId = Long.valueOf(fields.get(1));- Long projectId = Long.valueOf(fields.get(0));-- ThreadContext.bind(SecurityUtils.asSubject(userId));-- String refUpdateInfo = null;- Enumeration<String> paramNames = request.getParameterNames();- while (paramNames.hasMoreElements()) {- String paramName = paramNames.nextElement();- if (paramName.contains(" ")) {- refUpdateInfo = paramName;- }- }- Preconditions.checkState(refUpdateInfo != null, "Git ref update information is not available");-- Output output = new Output(response.getOutputStream());-- /*- * If multiple refs are updated, the hook stdin will put each ref update info into- * a separate line, however the line breaks is omitted when forward the hook stdin- * to curl via "@-", below logic is used to parse these info correctly even- * without line breaks.- */- refUpdateInfo = StringUtils.reverse(StringUtils.remove(refUpdateInfo, '\n'));-- fields.clear();- fields.addAll(StringUtils.splitAndTrim(refUpdateInfo, " "));-- List<Triple<String, ObjectId, ObjectId>> updateInfos = new ArrayList<>();-- int pos = 0;- while (true) {- String refName = StringUtils.reverse(fields.get(pos));- pos++;- ObjectId newObjectId = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));- pos++;- String field = fields.get(pos);- ObjectId oldObjectId = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));-- Repository repository = projectManager.getRepository(projectId);- String branch = GitUtils.ref2branch(refName);- String defaultBranch = GitUtils.getDefaultBranch(repository);- if (branch != null && defaultBranch == null) {- RefUpdate refUpdate = GitUtils.getRefUpdate(repository, "HEAD");- GitUtils.linkRef(refUpdate, refName);- }-- if (branch != null && defaultBranch != null && !branch.equals(defaultBranch)- && !userId.equals(User.SYSTEM_ID)) {- showPullRequestLink(output, projectId, branch, defaultBranch);- }-- try (RevWalk revWalk = new RevWalk(repository)) {- if (!oldObjectId.equals(ObjectId.zeroId()))- oldObjectId = revWalk.parseCommit(oldObjectId).copy();- if (!newObjectId.equals(ObjectId.zeroId()))- newObjectId = revWalk.parseCommit(newObjectId).copy();- }-- updateInfos.add(new ImmutableTriple<>(refName, oldObjectId, newObjectId));-- field = field.substring(40);- if (field.length() == 0)- break;- else- fields.set(pos, field);- }-- sessionManager.runAsyncAfterCommit(new Runnable() {-- @Override- public void run() {- Project project = projectManager.load(projectId);- try {- for (var updateInfo: updateInfos) {- RefUpdated event = new RefUpdated(project, updateInfo.getLeft(),- updateInfo.getMiddle(), updateInfo.getRight());- listenerRegistry.invokeListeners(event);- }- } catch (Exception e) {- logger.error("Error posting ref updated event", e);- }- }-- });- }-- private void showPullRequestLink(Output output, Long projectId, String branch, String defaultBranch) {- output.writeLine();- output.writeLine("Create a pull request for '"+ branch +"' by visiting:");- output.writeLine(" " + urlManager.urlForProject(projectId)- +"/pulls/new?target="- + projectId- + ":"- + defaultBranch- + "&source="- + projectId- + ":"- + branch);- output.writeLine();- }--}+package io.onedev.server.git.hook;++import java.io.IOException;+import java.util.ArrayList;+import java.util.Enumeration;+import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.servlet.ServletException;+import javax.servlet.http.HttpServlet;+import javax.servlet.http.HttpServletRequest;+import javax.servlet.http.HttpServletResponse;++import org.apache.commons.lang3.tuple.ImmutableTriple;+import org.apache.commons.lang3.tuple.Triple;+import org.apache.shiro.util.ThreadContext;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.RefUpdate;+import org.eclipse.jgit.lib.Repository;+import org.eclipse.jgit.revwalk.RevWalk;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.base.Preconditions;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UrlManager;+import io.onedev.server.event.ListenerRegistry;+import io.onedev.server.event.project.RefUpdated;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.security.SecurityUtils;++@SuppressWarnings("serial")+@Singleton+public class GitPostReceiveCallback extends HttpServlet {++ private static final Logger logger = LoggerFactory.getLogger(GitPostReceiveCallback.class);++ public static final String PATH = "/git-postreceive-callback";++ private final ProjectManager projectManager;++ private final UrlManager urlManager;++ private final SessionManager sessionManager;++ private final ListenerRegistry listenerRegistry;++ @Inject+ public GitPostReceiveCallback(ProjectManager projectManager, UrlManager urlManager,+ SessionManager sessionManager, ListenerRegistry listenerRegistry) {+ this.projectManager = projectManager;+ this.urlManager = urlManager;+ this.sessionManager = sessionManager;+ this.listenerRegistry = listenerRegistry;+ }++ @Sessional+ @Override+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {+ List<String> fields = StringUtils.splitAndTrim(request.getPathInfo(), "/");+ Preconditions.checkState(fields.size() == 3);++ if (!fields.get(2).equals(HookUtils.HOOK_TOKEN)) {+ response.sendError(HttpServletResponse.SC_FORBIDDEN,+ "Git hook callbacks can only be accessed by OneDev itself");+ return;+ }+ Long userId = Long.valueOf(fields.get(1));+ Long projectId = Long.valueOf(fields.get(0));++ ThreadContext.bind(SecurityUtils.asSubject(userId));++ String refUpdateInfo = null;+ Enumeration<String> paramNames = request.getParameterNames();+ while (paramNames.hasMoreElements()) {+ String paramName = paramNames.nextElement();+ if (paramName.contains(" ")) {+ refUpdateInfo = paramName;+ }+ }+ Preconditions.checkState(refUpdateInfo != null, "Git ref update information is not available");++ Output output = new Output(response.getOutputStream());++ /*+ * If multiple refs are updated, the hook stdin will put each ref update info into+ * a separate line, however the line breaks is omitted when forward the hook stdin+ * to curl via "@-", below logic is used to parse these info correctly even+ * without line breaks.+ */+ refUpdateInfo = StringUtils.reverse(StringUtils.remove(refUpdateInfo, '\n'));++ fields.clear();+ fields.addAll(StringUtils.splitAndTrim(refUpdateInfo, " "));++ List<Triple<String, ObjectId, ObjectId>> updateInfos = new ArrayList<>();++ int pos = 0;+ while (true) {+ String refName = StringUtils.reverse(fields.get(pos));+ pos++;+ ObjectId newObjectId = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));+ pos++;+ String field = fields.get(pos);+ ObjectId oldObjectId = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));++ Repository repository = projectManager.getRepository(projectId);+ String branch = GitUtils.ref2branch(refName);+ String defaultBranch = GitUtils.getDefaultBranch(repository);+ if (branch != null && defaultBranch == null) {+ RefUpdate refUpdate = GitUtils.getRefUpdate(repository, "HEAD");+ GitUtils.linkRef(refUpdate, refName);+ }++ if (branch != null && defaultBranch != null && !branch.equals(defaultBranch)+ && !userId.equals(User.SYSTEM_ID)) {+ showPullRequestLink(output, projectId, branch, defaultBranch);+ }++ try (RevWalk revWalk = new RevWalk(repository)) {+ if (!oldObjectId.equals(ObjectId.zeroId()))+ oldObjectId = revWalk.parseCommit(oldObjectId).copy();+ if (!newObjectId.equals(ObjectId.zeroId()))+ newObjectId = revWalk.parseCommit(newObjectId).copy();+ }++ updateInfos.add(new ImmutableTriple<>(refName, oldObjectId, newObjectId));++ field = field.substring(40);+ if (field.length() == 0)+ break;+ else+ fields.set(pos, field);+ }++ sessionManager.runAsyncAfterCommit(new Runnable() {++ @Override+ public void run() {+ Project project = projectManager.load(projectId);+ try {+ for (var updateInfo: updateInfos) {+ RefUpdated event = new RefUpdated(project, updateInfo.getLeft(),+ updateInfo.getMiddle(), updateInfo.getRight());+ listenerRegistry.invokeListeners(event);+ }+ } catch (Exception e) {+ logger.error("Error posting ref updated event", e);+ }+ }++ });+ }++ private void showPullRequestLink(Output output, Long projectId, String branch, String defaultBranch) {+ output.writeLine();+ output.writeLine("Create a pull request for '"+ branch +"' by visiting:");+ output.writeLine(" " + urlManager.urlForProject(projectId)+ +"/~pulls/new?target="+ + projectId+ + ":"+ + defaultBranch+ + "&source="+ + projectId+ + ":"+ + branch);+ output.writeLine();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex b47194918b..e415318076 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,2 +1,3 @@<wicket:extend>-</wicket:extend>\ No newline at end of file+ <a wicket:id="test">test</a>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex f634a193a1..d3f187afab 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -3,11 +3,11 @@ package io.onedev.server.web.page.test;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.page.base.BasePage;-@SuppressWarnings("serial")public class TestPage extends BasePage {public TestPage(PageParameters params) {@@ -17,6 +17,13 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();+ add(new Link<Void>("test") {++ @Override+ public void onClick() {+ }++ });}@Overridediff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex a8761f08c1..7ae1900581 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -48,6 +48,6 @@<module>server-plugin-report-cpd</module><module>server-plugin-sso-discord</module><module>server-plugin-notification-slack</module>- <module>server-plugin-notification-discord</module>- </modules>+ <module>server-plugin-notification-discord</module>+ </modules></project>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 2962878f3b..0bf5373ca2 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -40,7 +40,7 @@<plugins><plugin><artifactId>maven-archetype-plugin</artifactId>- <version>2.2</version>+ <version>3.1.2</version><executions><execution><id>install-archetype</id>diff --git a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xmlindex 9b4ffe60e4..be4dfb57a7 100644--- a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml+++ b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml@@ -33,12 +33,12 @@<plugin><groupId>io.onedev</groupId><artifactId>plugin-maven</artifactId>- <version>2.4.1</version>+ <version>2.6.0</version><executions><execution><?m2e execute onConfiguration,onIncremental?><id>generate-resources</id>- <phase>generate-resources</phase>+ <phase>generate-sources</phase><goals><goal>generate-resources</goal></goals>@@ -94,6 +94,21 @@</executions></plugin></plugins>+ <resources>+ <resource>+ <directory>src/main/java</directory>+ <excludes>+ <exclude>**/*.java</exclude>+ </excludes>+ </resource>+ <resource>+ <directory>src/main/resources</directory>+ <filtering>true</filtering>+ </resource>+ <resource>+ <directory>target/generated-resources</directory>+ </resource>+ </resources></build><dependencies><dependency>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 7b6f1d3e22..f8f3964c10 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -160,7 +160,6 @@<artifactId>server-plugin-notification-discord</artifactId><version>${project.version}</version></dependency>-<!-- Add explicit dependencies to make sure standalone plugins use expected lib version --><dependency><groupId>commons-codec</groupId>