mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 13:32:24 +00:00
Merge branch 'master' into JENKINS-34755
Conflicts: core/src/main/java/hudson/Util.java core/src/main/java/hudson/WebAppMain.java core/src/main/java/hudson/model/Item.java core/src/main/java/hudson/model/Queue.java core/src/main/java/hudson/model/UpdateCenter.java core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java core/src/main/java/hudson/slaves/NodeProvisioner.java core/src/main/java/jenkins/model/Jenkins.java core/src/main/java/jenkins/slaves/NioChannelSelector.java core/src/main/java/jenkins/util/xml/XMLUtils.java
This commit is contained in:
commit
ce8922bd74
1362 files changed
+26469
-20661
No files matched your search
@@ -75,6 +75,8 @@ import hudson.tasks.Publisher;
|
||||
import hudson.tasks.UserAvatarResolver;
|
||||
import hudson.util.Area;
|
||||
import hudson.util.FormValidation.CheckMethod;
|
||||
import hudson.util.HudsonIsLoading;
|
||||
import hudson.util.HudsonIsRestarting;
|
||||
import hudson.util.Iterators;
|
||||
import hudson.util.jna.GNUCLibrary;
|
||||
import hudson.util.Secret;
|
||||
@@ -129,7 +131,6 @@ import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import jenkins.model.GlobalConfiguration;
|
||||
import jenkins.model.GlobalConfigurationCategory;
|
||||
import jenkins.model.GlobalConfigurationCategory.Unclassified;
|
||||
import jenkins.model.Jenkins;
|
||||
import jenkins.model.ModelObjectWithChildren;
|
||||
import jenkins.model.ModelObjectWithContextMenu;
|
||||
@@ -208,20 +209,28 @@ public class Functions {
|
||||
|
||||
/**
|
||||
* During Jenkins start-up, before {@link InitMilestone#PLUGINS_STARTED} the extensions lists will be empty
|
||||
* and they are not guaranteed to be fully populated until after {@link InitMilestone#EXTENSIONS_AUGMENTED}.
|
||||
* and they are not guaranteed to be fully populated until after {@link InitMilestone#EXTENSIONS_AUGMENTED},
|
||||
* similarly, during termination after {@link Jenkins#isTerminating()} is set, it is no longer safe to access
|
||||
* the extensions lists.
|
||||
* If you attempt to access the extensions list from a UI thread while the extensions are being loaded you will
|
||||
* hit a big honking great monitor lock that will block until the effective extension list has been determined
|
||||
* (as if a plugin fails to start, all of the failed plugin's extensions and any dependent plugins' extensions
|
||||
* will have to be evicted from the list of extensions. In practical terms this only affects the
|
||||
* "Jenkins is loading" screen, but as that screen uses the generic layouts we provide this utility method
|
||||
* so that the generic layouts can avoid iterating extension lists while Jenkins is starting up.
|
||||
* If you attempt to access the extensions list from a UI thread while Jenkins is being shut down, the extensions
|
||||
* themselves may no longer be in a valid state and could attempt to revive themselves and block termination.
|
||||
* In actual terms the termination only affects those views required to render {@link HudsonIsRestarting}'s
|
||||
* {@code index.jelly} which is the same set as the {@link HudsonIsLoading} pages so it makes sense to
|
||||
* use both checks here.
|
||||
*
|
||||
* @return {@code true} if the extensions lists have been populated.
|
||||
* @since 1.607
|
||||
*/
|
||||
public static boolean isExtensionsAvailable() {
|
||||
final Jenkins jenkins = Jenkins.getInstance();
|
||||
return jenkins != null && jenkins.getInitLevel().compareTo(InitMilestone.EXTENSIONS_AUGMENTED) >= 0;
|
||||
final Jenkins jenkins = Jenkins.getInstanceOrNull();
|
||||
return jenkins != null && jenkins.getInitLevel().compareTo(InitMilestone.EXTENSIONS_AUGMENTED) >= 0
|
||||
&& !jenkins.isTerminating();
|
||||
}
|
||||
|
||||
public static void initPageVariables(JellyContext context) {
|
||||
@@ -956,12 +965,8 @@ public class Functions {
|
||||
Descriptor d = c.getInstance();
|
||||
if (d.getGlobalConfigPage()==null) continue;
|
||||
|
||||
if (d instanceof GlobalConfiguration) {
|
||||
if (predicate.apply(((GlobalConfiguration)d).getCategory()))
|
||||
r.add(new Tag(c.ordinal(), d));
|
||||
} else {
|
||||
if (predicate.apply(GlobalConfigurationCategory.get(Unclassified.class)))
|
||||
r.add(new Tag(0, d));
|
||||
if (predicate.apply(d.getCategory())) {
|
||||
r.add(new Tag(c.ordinal(), d));
|
||||
}
|
||||
}
|
||||
Collections.sort(r);
|
||||
@@ -1528,10 +1533,12 @@ public class Functions {
|
||||
/**
|
||||
* Computes the hyperlink to actions, to handle the situation when the {@link Action#getUrlName()}
|
||||
* returns absolute URL.
|
||||
*
|
||||
* @return null in case the action should not be presented to the user.
|
||||
*/
|
||||
public static String getActionUrl(String itUrl,Action action) {
|
||||
public static @CheckForNull String getActionUrl(String itUrl,Action action) {
|
||||
String urlName = action.getUrlName();
|
||||
if(urlName==null) return null; // to avoid NPE and fail to render the whole page
|
||||
if(urlName==null) return null; // Should not be displayed
|
||||
try {
|
||||
if (new URI(urlName).isAbsolute()) {
|
||||
return urlName;
|
||||
@@ -1572,7 +1579,7 @@ public class Functions {
|
||||
* Obtains the host name of the Hudson server that clients can use to talk back to.
|
||||
* <p>
|
||||
* This is primarily used in <tt>slave-agent.jnlp.jelly</tt> to specify the destination
|
||||
* that the slaves talk to.
|
||||
* that the agents talk to.
|
||||
*/
|
||||
public String getServerName() {
|
||||
// Try to infer this from the configured root URL.
|
||||
@@ -1646,7 +1653,7 @@ public class Functions {
|
||||
*/
|
||||
public static List<PageDecorator> getPageDecorators() {
|
||||
// this method may be called to render start up errors, at which point Hudson doesn't exist yet. see HUDSON-3608
|
||||
if(Jenkins.getInstance()==null) return Collections.emptyList();
|
||||
if(Jenkins.getInstanceOrNull()==null) return Collections.emptyList();
|
||||
return PageDecorator.all();
|
||||
}
|
||||
|
||||
@@ -1668,13 +1675,13 @@ public class Functions {
|
||||
}
|
||||
|
||||
public static String getCrumb(StaplerRequest req) {
|
||||
Jenkins h = Jenkins.getInstance();
|
||||
Jenkins h = Jenkins.getInstanceOrNull();
|
||||
CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
|
||||
return issuer != null ? issuer.getCrumb(req) : "";
|
||||
}
|
||||
|
||||
public static String getCrumbRequestField() {
|
||||
Jenkins h = Jenkins.getInstance();
|
||||
Jenkins h = Jenkins.getInstanceOrNull();
|
||||
CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
|
||||
return issuer != null ? issuer.getDescriptor().getCrumbRequestField() : "";
|
||||
}
|
||||
@@ -1739,7 +1746,16 @@ public class Functions {
|
||||
*/
|
||||
public String getPasswordValue(Object o) {
|
||||
if (o==null) return null;
|
||||
if (o instanceof Secret) return ((Secret)o).getEncryptedValue();
|
||||
if (o instanceof Secret) {
|
||||
StaplerRequest req = Stapler.getCurrentRequest();
|
||||
if (req != null) {
|
||||
Item item = req.findAncestorObject(Item.class);
|
||||
if (item != null && !item.hasPermission(Item.CONFIGURE)) {
|
||||
return "********";
|
||||
}
|
||||
}
|
||||
return ((Secret) o).getEncryptedValue();
|
||||
}
|
||||
if (getIsUnitTest()) {
|
||||
throw new SecurityException("attempted to render plaintext ‘" + o + "’ in password field; use a getter of type Secret instead");
|
||||
}
|
||||
@@ -1904,7 +1920,7 @@ public class Functions {
|
||||
* discovery of Jenkins.
|
||||
*/
|
||||
public static void advertiseHeaders(HttpServletResponse rsp) {
|
||||
Jenkins j = Jenkins.getInstance();
|
||||
Jenkins j = Jenkins.getInstanceOrNull();
|
||||
if (j!=null) {
|
||||
rsp.setHeader("X-Hudson","1.395");
|
||||
rsp.setHeader("X-Jenkins", Jenkins.VERSION);
|
||||
@@ -1912,7 +1928,7 @@ public class Functions {
|
||||
|
||||
TcpSlaveAgentListener tal = j.tcpSlaveAgentListener;
|
||||
if (tal !=null) {
|
||||
int p = TcpSlaveAgentListener.CLI_PORT !=null ? TcpSlaveAgentListener.CLI_PORT : tal.getPort();
|
||||
int p = tal.getAdvertisedPort();
|
||||
rsp.setIntHeader("X-Hudson-CLI-Port", p);
|
||||
rsp.setIntHeader("X-Jenkins-CLI-Port", p);
|
||||
rsp.setIntHeader("X-Jenkins-CLI2-Port", p);
|
||||
|
||||
Reference in new issue
Block a user