← Back to branch summary

~ubuntu-branches/ubuntu/saucy/jenkins/saucy-proposed

« back to all changes in this revision

Viewing changes to core/src/main/java/hudson/model/Api.java

  • 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/java/hudson/model/Api.java
24
24
package hudson.model;
25
25
 
26
26
import hudson.util.IOException2;
 
27
import jenkins.model.Jenkins;
27
28
import org.dom4j.CharacterData;
28
29
import org.dom4j.Document;
29
30
import org.dom4j.DocumentException;
85
86
                      @QueryParameter String wrapper,
86
87
                      @QueryParameter String tree,
87
88
                      @QueryParameter int depth) throws IOException, ServletException {
 
89
        setHeaders(rsp);
 
90
 
88
91
        String[] excludes = req.getParameterValues("exclude");
89
92
 
90
93
        if(xpath==null && excludes==null) {
174
177
     * Generate schema.
175
178
     */
176
179
    public void doSchema(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
 
180
        setHeaders(rsp);
177
181
        rsp.setContentType("application/xml");
178
182
        StreamResult r = new StreamResult(rsp.getOutputStream());
179
183
        new SchemaGenerator(new ModelBuilder().get(bean.getClass())).generateSchema(r);
185
189
     */
186
190
    public void doJson(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
187
191
        if (INSECURE || req.getParameter("jsonp") == null) {
 
192
        setHeaders(rsp);
188
193
            rsp.serveExposedBean(req,bean, Flavor.JSON);
189
194
        } else {
190
195
            rsp.sendError(HttpURLConnection.HTTP_FORBIDDEN, "jsonp forbidden; can use -Dhudson.model.Api.INSECURE=true if you run without security");
195
200
     * Exposes the bean as Python literal.
196
201
     */
197
202
    public void doPython(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
 
203
        setHeaders(rsp);
198
204
        rsp.serveExposedBean(req,bean, Flavor.PYTHON);
199
205
    }
200
206
 
 
207
    private void setHeaders(StaplerResponse rsp) {
 
208
        rsp.setHeader("X-Jenkins", Jenkins.VERSION);
 
209
        rsp.setHeader("X-Jenkins-Session", Jenkins.SESSION_HASH);
 
210
    }
 
211
 
201
212
    private static final Logger LOGGER = Logger.getLogger(Api.class.getName());
202
213
    private static final ModelBuilder MODEL_BUILDER = new ModelBuilder();
203
214
    private static final boolean INSECURE = "true".equals(System.getProperty("hudson.model.Api.INSECURE"));