← Back to branch summary

~ubuntu-branches/ubuntu/trusty/jenkins/trusty

« back to all changes in this revision

Viewing changes to core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-13 12:35:19 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130813123519-tizgfxcr70trl7r0
Tags: 1.509.2+dfsg-1
http://bugs.debian.org/706725
http://bugs.debian.org/701163
http://bugs.debian.org/704848
* New upstream release (Closes: #706725):
  - d/control: Update versioned BD's:
    * jenkins-executable-war >= 1.28.
    * jenkins-instance-identity >= 1.3.
    * libjenkins-remoting-java >= 2.23.
    * libjenkins-winstone-java >= 0.9.10-jenkins-44.
    * libstapler-java >= 1.207.
    * libjenkins-json-java >= 2.4-jenkins-1.
    * libstapler-adjunct-timeline-java >= 1.4.
    * libstapler-adjunct-codemirror-java >= 1.2.
    * libmaven-hpi-plugin-java >= 1.93.
    * libjenkins-xstream-java >= 1.4.4-jenkins-3.
  - d/maven.rules: Map to older version of animal-sniffer-maven-plugin.
  - Add patch for compatibility with guava >= 0.14.
  - Add patch to exclude asm4 dependency via jnr-posix.
  - Fixes the following security vulnerabilities:
    CVE-2013-2034, CVE-2013-2033, CVE-2013-2034, CVE-2013-1808
* d/patches/*: Switch to using git patch-queue for managing patches.
* De-duplicate jars between libjenkins-java and jenkins-external-job-monitor
  (Closes: #701163):
  - d/control: Add dependency between jenkins-external-job-monitor ->
    libjenkins-java.
  - d/rules: 
    Drop installation of jenkins-core in jenkins-external-job-monitor.
  - d/jenkins-external-job-monitor.{links,install}: Link to jenkins-core
    in /usr/share/java instead of included version.
* Wait longer for jenkins to stop during restarts (Closes: #704848):
  - d/jenkins.init: Re-sync init script from upstream codebase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
 
1
package hudson.security.GlobalSecurityConfiguration
 
2
 
 
3
import hudson.security.SecurityRealm
 
4
import hudson.markup.MarkupFormatterDescriptor
 
5
import hudson.security.AuthorizationStrategy
 
6
import jenkins.model.GlobalConfiguration
 
7
import hudson.Functions
 
8
import hudson.model.Descriptor
 
9
 
 
10
def f=namespace(lib.FormTagLib)
 
11
def l=namespace(lib.LayoutTagLib)
 
12
def st=namespace("jelly:stapler")
 
13
 
 
14
l.layout(norefresh:true, permission:app.ADMINISTER, title:my.displayName) {
 
15
    l.main_panel {
 
16
        h1 {
 
17
            img(src:"${imagesURL}/48x48/secure.png", height:48,width:48)
 
18
            text(my.displayName)
 
19
        }
 
20
 
 
21
        p()
 
22
        div(class:"behavior-loading", _("LOADING"))
 
23
        f.form(method:"post",name:"config",action:"configure") {
 
24
            set("instance",my);
 
25
 
 
26
            f.optionalBlock( field:"useSecurity", title:_("Enable security"), checked:app.useSecurity) {
 
27
                f.entry (title:_("TCP port for JNLP slave agents"), field:"slaveAgentPort") {
 
28
                    f.serverTcpPort()
 
29
                }
 
30
 
 
31
                f.dropdownDescriptorSelector(title:_("Markup Formatter"),descriptors: MarkupFormatterDescriptor.all(), field: 'markupFormatter')
 
32
 
 
33
                f.entry(title:_("Access Control")) {
 
34
                    table(style:"width:100%") {
 
35
                        f.descriptorRadioList(title:_("Security Realm"),varName:"realm",         instance:app.securityRealm,         descriptors:SecurityRealm.all())
 
36
                        f.descriptorRadioList(title:_("Authorization"), varName:"authorization", instance:app.authorizationStrategy, descriptors:AuthorizationStrategy.all())
 
37
                    }
 
38
                }
 
39
            }
 
40
 
 
41
            Functions.getSortedDescriptorsForGlobalConfig(my.FILTER).each { Descriptor descriptor ->
 
42
                set("descriptor",descriptor)
 
43
                set("instance",descriptor)
 
44
                f.rowSet(name:descriptor.jsonSafeClassName) {
 
45
                    st.include(from:descriptor, page:descriptor.globalConfigPage)
 
46
                }
 
47
            }
 
48
 
 
49
            f.bottomButtonBar {
 
50
                f.submit(value:_("Save"))
 
51
                f.apply()
 
52
            }
 
53
        }
 
54
    }
 
55
}
 
56