提交 474964cc 编写于 作者: R Ryan Campbell

Add PluginManager.CONFIGURE_UPDATECENTER permission which allows a user to...

Add PluginManager.CONFIGURE_UPDATECENTER permission which allows a user to configure update sites and proxy info.
上级 2ebf332b
......@@ -611,7 +611,7 @@ public abstract class PluginManager extends AbstractModelObject {
}
public HttpResponse doUpdateSources(StaplerRequest req) throws IOException {
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
Jenkins.getInstance().checkPermission(CONFIGURE_UPDATECENTER);
if (req.hasParameter("remove")) {
UpdateCenter uc = Jenkins.getInstance().getUpdateCenter();
......@@ -658,7 +658,7 @@ public abstract class PluginManager extends AbstractModelObject {
*/
public HttpResponse doSiteConfigure(@QueryParameter String site) throws IOException {
Jenkins hudson = Jenkins.getInstance();
hudson.checkPermission(Jenkins.ADMINISTER);
hudson.checkPermission(CONFIGURE_UPDATECENTER);
UpdateCenter uc = hudson.getUpdateCenter();
PersistedList<UpdateSite> sites = uc.getSites();
for (UpdateSite s : sites) {
......@@ -673,7 +673,7 @@ public abstract class PluginManager extends AbstractModelObject {
public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, ServletException {
Jenkins jenkins = Jenkins.getInstance();
jenkins.checkPermission(Jenkins.ADMINISTER);
jenkins.checkPermission(CONFIGURE_UPDATECENTER);
ProxyConfiguration pc = req.bindJSON(ProxyConfiguration.class, req.getSubmittedForm());
if (pc.name==null) {
......@@ -834,6 +834,7 @@ public abstract class PluginManager extends AbstractModelObject {
public static boolean FAST_LOOKUP = !Boolean.getBoolean(PluginManager.class.getName()+".noFastLookup");
public static final Permission UPLOAD_PLUGINS = new Permission(Jenkins.PERMISSIONS, "UploadPlugins", Messages._PluginManager_UploadPluginsPermission_Description(),Jenkins.ADMINISTER,PermissionScope.JENKINS);
public static final Permission CONFIGURE_UPDATECENTER = new Permission(Jenkins.PERMISSIONS, "ConfigureUpdateCenter", Messages._PluginManager_ConfigureUpdateCenterPermission_Description(),Jenkins.ADMINISTER,PermissionScope.JENKINS);
/**
* Remembers why a plugin failed to deploy.
......
......@@ -56,6 +56,9 @@ PluginManager.PortNotANumber=Port is not a number
PluginManager.PortNotInRange=Port does''t range from {0} to {1}
PluginManager.UploadPluginsPermission.Description=\
The "upload plugin" permission allows a user to upload arbitrary plugins.
PluginManager.ConfigureUpdateCenterPermission.Description=\
The "configure update center" permission allows a user to \
configure update sites and proxy settings.
AboutJenkins.DisplayName=About Jenkins
AboutJenkins.Description=See the version and license information
......@@ -34,6 +34,7 @@ THE SOFTWARE.
<table id="pluginsAdv" class="pane" style="margin-top:0; border-top:none">
<tr style="border-top:none; white-space: normal">
<td>
<l:hasPermission permission="${app.pluginManager.CONFIGURE_UPDATECENTER}">
<h1>${%HTTP Proxy Configuration}</h1>
<f:form method="post" action="proxyConfigure">
<j:scope>
......@@ -45,6 +46,7 @@ THE SOFTWARE.
<f:submit value="${%Submit}" />
</f:block>
</f:form>
</l:hasPermission>
<l:hasPermission permission="${app.pluginManager.UPLOAD_PLUGINS}">
<h1>${%Upload Plugin}</h1>
......@@ -63,6 +65,7 @@ THE SOFTWARE.
</f:block>
</f:form>
</l:hasPermission>
<l:hasPermission permission="${app.pluginManager.CONFIGURE_UPDATECENTER}">
<h1>${%Update Site}</h1>
<f:form method="post" action="siteConfigure">
<f:entry title="${%URL}" >
......@@ -72,6 +75,7 @@ THE SOFTWARE.
<f:submit value="${%Submit}" />
</f:block>
</f:form>
</l:hasPermission>
</td>
</tr>
</table>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册