- * Subtypes would likely want to extend from either {@link MasterToSlaveCallable}
- * or {@link SlaveToMasterFileCallable}.
- *
+ * A typical implementation would be a {@code record} implementing {@link ControllerToAgentFileCallable}.
* @see FilePath#act(FileCallable)
*/
public interface FileCallable
* If you are using this method, you'll likely be interested in
* using {@link #save()} and {@link #load()}.
+ * @since 2.475
+ */
+ public void configure(StaplerRequest2 req, JSONObject formData) throws IOException, ServletException, FormException {
+ try {
+ if (Util.isOverridden(Plugin.class, getClass(), "configure", StaplerRequest.class, JSONObject.class)) {
+ configure(StaplerRequest.fromStaplerRequest2(req), formData);
+ } else {
+ configure(formData);
+ }
+ } catch (javax.servlet.ServletException e) {
+ throw ServletExceptionWrapper.toJakartaServletException(e);
+ }
+ }
+
+ /**
+ * @deprecated use {@link #configure(StaplerRequest2, JSONObject)}
* @since 1.305
*/
- public void configure(StaplerRequest req, JSONObject formData) throws IOException, ServletException, FormException {
+ @Deprecated
+ public void configure(StaplerRequest req, JSONObject formData) throws IOException, javax.servlet.ServletException, FormException {
configure(formData);
}
/**
* This method serves static resources in the plugin under {@code hudson/plugin/SHORTNAME}.
+ *
+ * @since 2.475
+ */
+ public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+ if (Util.isOverridden(Plugin.class, getClass(), "doDynamic", StaplerRequest.class, StaplerResponse.class)) {
+ try {
+ doDynamic(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+ } catch (javax.servlet.ServletException e) {
+ throw ServletExceptionWrapper.toJakartaServletException(e);
+ }
+ } else {
+ doDynamicImpl(req, rsp);
+ }
+ }
+
+ /**
+ * @deprecated use {@link #doDynamic(StaplerRequest2, StaplerResponse2)}
*/
- public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+ @Deprecated
+ @StaplerNotDispatchable
+ public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+ try {
+ doDynamicImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+ } catch (ServletException e) {
+ throw ServletExceptionWrapper.fromJakartaServletException(e);
+ }
+ }
+
+ private void doDynamicImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
String path = req.getRestOfPath();
String pathUC = path.toUpperCase(Locale.ENGLISH);
diff --git a/core/src/main/java/hudson/PluginFirstClassLoader2.java b/core/src/main/java/hudson/PluginFirstClassLoader2.java
index 974939d53acb..30618835c8a7 100644
--- a/core/src/main/java/hudson/PluginFirstClassLoader2.java
+++ b/core/src/main/java/hudson/PluginFirstClassLoader2.java
@@ -25,8 +25,9 @@ public class PluginFirstClassLoader2 extends URLClassLoader2 {
registerAsParallelCapable();
}
- public PluginFirstClassLoader2(@NonNull URL[] urls, @NonNull ClassLoader parent) {
- super(Objects.requireNonNull(urls), Objects.requireNonNull(parent));
+
+ public PluginFirstClassLoader2(String name, @NonNull URL[] urls, @NonNull ClassLoader parent) {
+ super(name, Objects.requireNonNull(urls), Objects.requireNonNull(parent));
}
/**
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 649cc045b482..b90b2eb9f6d4 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -41,6 +41,7 @@
import hudson.init.InitMilestone;
import hudson.init.InitStrategy;
import hudson.init.InitializerFinder;
+import hudson.lifecycle.Lifecycle;
import hudson.model.AbstractItem;
import hudson.model.AbstractModelObject;
import hudson.model.AdministrativeMonitor;
@@ -65,6 +66,10 @@
import hudson.util.Service;
import hudson.util.VersionNumber;
import hudson.util.XStream2;
+import io.jenkins.servlet.ServletContextWrapper;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FilenameFilter;
@@ -90,6 +95,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
@@ -116,8 +122,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
import javax.xml.XMLConstants;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
@@ -132,19 +136,21 @@
import jenkins.model.Jenkins;
import jenkins.plugins.DetachedPluginsUtil;
import jenkins.security.CustomClassFilter;
+import jenkins.security.stapler.StaplerNotDispatchable;
import jenkins.util.SystemProperties;
import jenkins.util.io.OnMaster;
import jenkins.util.xml.RestrictiveEntityResolver;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload2.core.DiskFileItem;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.LogFactory;
import org.jenkinsci.Symbol;
import org.jvnet.hudson.reactor.Executable;
@@ -162,7 +168,8 @@
import org.kohsuke.stapler.StaplerOverridable;
import org.kohsuke.stapler.StaplerProxy;
import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -234,11 +241,22 @@ PluginManager doCreate(@NonNull Class klass,
return klass.getConstructor(Jenkins.class).newInstance(jenkins);
}
},
+ SC_FILE2 {
+ @Override
+ @NonNull PluginManager doCreate(@NonNull Class klass,
+ @NonNull Jenkins jenkins) throws ReflectiveOperationException {
+ return klass.getConstructor(ServletContext.class, File.class).newInstance(jenkins.getServletContext(), jenkins.getRootDir());
+ }
+ },
+ /**
+ * @deprecated use {@link #SC_FILE2}
+ */
+ @Deprecated
SC_FILE {
@Override
@NonNull PluginManager doCreate(@NonNull Class klass,
@NonNull Jenkins jenkins) throws ReflectiveOperationException {
- return klass.getConstructor(ServletContext.class, File.class).newInstance(jenkins.servletContext, jenkins.getRootDir());
+ return klass.getConstructor(javax.servlet.ServletContext.class, File.class).newInstance(jenkins.servletContext, jenkins.getRootDir());
}
},
FILE {
@@ -272,7 +290,7 @@ PluginManager doCreate(@NonNull Class klass,
*/
public static @NonNull PluginManager createDefault(@NonNull Jenkins jenkins) {
String pmClassName = SystemProperties.getString(CUSTOM_PLUGIN_MANAGER);
- if (!StringUtils.isBlank(pmClassName)) {
+ if (pmClassName != null && !pmClassName.isBlank()) {
LOGGER.log(FINE, String.format("Use of custom plugin manager [%s] requested.", pmClassName));
try {
final Class klass = Class.forName(pmClassName).asSubclass(PluginManager.class);
@@ -360,6 +378,9 @@ PluginManager doCreate(@NonNull Class klass,
*/
private final PluginStrategy strategy;
+ /**
+ * @since 2.475
+ */
protected PluginManager(ServletContext context, File rootDir) {
this.context = context;
@@ -370,11 +391,19 @@ protected PluginManager(ServletContext context, File rootDir) {
throw new UncheckedIOException(e);
}
String workDir = SystemProperties.getString(PluginManager.class.getName() + ".workDir");
- this.workDir = StringUtils.isBlank(workDir) ? null : new File(workDir);
+ this.workDir = workDir == null || workDir.isBlank() ? null : new File(workDir);
strategy = createPluginStrategy();
}
+ /**
+ * @deprecated use {@link #PluginManager(ServletContext, File)}
+ */
+ @Deprecated
+ protected PluginManager(javax.servlet.ServletContext context, File rootDir) {
+ this(context != null ? ServletContextWrapper.toJakartaServletContext(context) : null, rootDir);
+ }
+
public Api getApi() {
Jenkins.get().checkPermission(Jenkins.SYSTEM_READ);
return new Api(this);
@@ -612,7 +641,7 @@ public void run(Reactor reactor) throws Exception {
}});
}
- void considerDetachedPlugin(String shortName) {
+ void considerDetachedPlugin(String shortName, String source) {
if (new File(rootDir, shortName + ".jpi").isFile() ||
new File(rootDir, shortName + ".hpi").isFile() ||
new File(rootDir, shortName + ".jpl").isFile() ||
@@ -624,7 +653,7 @@ void considerDetachedPlugin(String shortName) {
for (String loadedFile : loadPluginsFromWar(getDetachedLocation(), (dir, name) -> normalisePluginName(name).equals(shortName))) {
String loaded = normalisePluginName(loadedFile);
File arc = new File(rootDir, loaded + ".jpi");
- LOGGER.info(() -> "Loading a detached plugin as a dependency: " + arc);
+ LOGGER.info(() -> "Loading a detached plugin " + arc + " as a dependency of " + source);
try {
plugins.add(strategy.createPluginWrapper(arc));
} catch (IOException e) {
@@ -652,7 +681,7 @@ void considerDetachedPlugin(String shortName) {
protected @NonNull Set Equivalent to {@code newHttpClientBuilder().followRedirects(HttpClient.Redirect.NORMAL).build()}.
*
- * The Jenkins-specific default settings include a proxy server and proxy authentication (as
- * configured by {@link ProxyConfiguration}) and a connection timeout (as configured by {@link
- * ProxyConfiguration#DEFAULT_CONNECT_TIMEOUT_MILLIS}).
- *
* @return a new {@link HttpClient}
* @since 2.379
+ * @see #newHttpClientBuilder
*/
public static HttpClient newHttpClient() {
return newHttpClientBuilder().followRedirects(HttpClient.Redirect.NORMAL).build();
@@ -383,6 +381,12 @@ public static HttpClient newHttpClient() {
* configured by {@link ProxyConfiguration}) and a connection timeout (as configured by {@link
* ProxyConfiguration#DEFAULT_CONNECT_TIMEOUT_MILLIS}).
*
+ * Warning: if both {@link #getName} and {@link #getUserName} are set
+ * (meaning that an authenticated proxy is defined),
+ * you will not be able to pass an {@code Authorization} header to the real server
+ * when running on Java 17 and later
+ * (pending JDK-8326949.
+ *
* @return an {@link HttpClient.Builder}
* @since 2.379
*/
@@ -536,6 +540,34 @@ public FormValidation doCheckPort(@QueryParameter String value) {
return FormValidation.ok();
}
+ /**
+ * Do check if the provided value is empty or composed of whitespaces.
+ * If so, return a validation warning.
+ *
+ * @param value the value to test
+ * @return a validation warning iff the provided value is empty or composed of whitespaces.
+ */
+ private static FormValidation checkProxyCredentials(String value) {
+ value = Util.fixEmptyAndTrim(value);
+ if (value == null) {
+ return FormValidation.ok();
+ } else {
+ return FormValidation.warning(Messages.ProxyConfiguration_NonTLSWarning());
+ }
+ }
+
+ @RequirePOST
+ @Restricted(NoExternalUse.class)
+ public FormValidation doCheckUserName(@QueryParameter String value) {
+ return checkProxyCredentials(value);
+ }
+
+ @RequirePOST
+ @Restricted(NoExternalUse.class)
+ public FormValidation doCheckSecretPassword(@QueryParameter String value) {
+ return checkProxyCredentials(value);
+ }
+
@RequirePOST
@Restricted(NoExternalUse.class)
public FormValidation doValidateProxy(
@@ -576,8 +608,8 @@ public FormValidation doValidateProxy(
}
try {
HttpResponse
+ Om detta fält lämnas tomt kommer Jenkins försöka ansluta till internet
+ direkt.
+ Kontrollera webbläsarens proxykonfiguration om du är osäker på värdet.
+ Om denna proxy kräver Microsofts autentiseringsschema
+ NTLM
+ kan domännamnet kodas i användarnamnet med ett domännamn som prefix följt av
+ en omvänt snedstreck "\" före användarnamnet, t.ex. "ACME\John Doo".
+
- *
* Note that every plugin gets a {@link DummyImpl} by default,
* which will still route the URL space, serve {@link #getWrapper}, and so on.
@@ -189,10 +193,10 @@ public void stop() throws Exception {
/**
* @since 1.233
- * @deprecated as of 1.305 override {@link #configure(StaplerRequest,JSONObject)} instead
+ * @deprecated as of 1.305 override {@link #configure(StaplerRequest2,JSONObject)} instead
*/
@Deprecated
- public void configure(JSONObject formData) throws IOException, ServletException, FormException {
+ public void configure(JSONObject formData) throws IOException, javax.servlet.ServletException, FormException {
}
/**
@@ -220,16 +224,60 @@ public void configure(JSONObject formData) throws IOException, ServletException,
*
@@ -85,7 +85,7 @@ THE SOFTWARE.
-
@@ -99,6 +99,13 @@ THE SOFTWARE.
+
-
-
+
${p.cause.message}
-
${%parentCompatWarning}
@@ -153,15 +153,15 @@ THE SOFTWARE.
${%parentDepCompatWarning}
$JENKINS_HOME, \
+ men lämnar insticksprogrammets konfigurationsfiler orörda.
+title=Avinstallera insticksprogrammet {0}
diff --git a/core/src/main/resources/hudson/ProxyConfiguration/config_sv_SE.properties b/core/src/main/resources/hudson/ProxyConfiguration/config_sv_SE.properties
index be56997326c1..4d43147f8eb3 100644
--- a/core/src/main/resources/hudson/ProxyConfiguration/config_sv_SE.properties
+++ b/core/src/main/resources/hudson/ProxyConfiguration/config_sv_SE.properties
@@ -1,36 +1,19 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# This file is under the MIT License by authors
Check\ now=Kontrollera nu
File=Fil
-HTTP\ Proxy\ Configuration=HTTP proxy konfiguration
+HTTP\ Proxy\ Configuration=Konfiguration av HTTP-proxy
Password=Lösenord
Port=Port
Server=Server
Submit=Skicka
-URL=URL
-Update\ Site=Updatera sajt
+URL=Webbadress
+Update\ Site=Uppdateringswebbplats
Upload=Ladda upp
-Upload\ Plugin=Ladda upp insticksmodul
+Upload\ Plugin=Ladda upp insticksprogram
User\ name=Användarnamn
lastUpdated=Information uppdaterad {0} sedan
-uploadtext=Du kan ladda upp en .hpi-fil för att installera en insticksmodul som ligger utanför den centrala instickskatalogen.
+uploadtext=Du kan ladda upp en .hpi-fil för att installera ett insticksprogram som ligger utanför den centrala instickskatalogen.
+Validate\ Proxy=Validera proxy
+No\ Proxy\ Host=Ingen proxyvärd
+Test\ URL=Testwebbadress
diff --git a/core/src/main/resources/hudson/ProxyConfiguration/help-name_sv_SE.html b/core/src/main/resources/hudson/ProxyConfiguration/help-name_sv_SE.html
new file mode 100644
index 000000000000..b84ccc77ac74
--- /dev/null
+++ b/core/src/main/resources/hudson/ProxyConfiguration/help-name_sv_SE.html
@@ -0,0 +1,20 @@
+JENKINS_HOME är nästan full
+description.1=\
+ Din JENKINS_HOME ({0}) är nästan full. \
+ När katalogen blir fylld helt och hållet kommer den att orsaka förödelse eftersom Jenkins inte kan lagra mer data.
+description.2=För att förhindra problemet bör du agera nu.
+solution.1=Rensa några filer från denna partition för att frigöra utrymme.
+solution.2=\
+ Flytta JENKINS_HOME till en större partition. \
+ Besök vår dokumentation för att ta reda på hur man gör detta.
+
+JENKINS_HOME\ is\ almost\ full=JENKINS_HOME är nästan full
diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
index 1ff3673ab660..488407988acf 100644
--- a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.