← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java
 
1
/**
 
2
 * @copyright
 
3
 * ====================================================================
 
4
 *    Licensed to the Apache Software Foundation (ASF) under one
 
5
 *    or more contributor license agreements.  See the NOTICE file
 
6
 *    distributed with this work for additional information
 
7
 *    regarding copyright ownership.  The ASF licenses this file
 
8
 *    to you under the Apache License, Version 2.0 (the
 
9
 *    "License"); you may not use this file except in compliance
 
10
 *    with the License.  You may obtain a copy of the License at
 
11
 *
 
12
 *      http://www.apache.org/licenses/LICENSE-2.0
 
13
 *
 
14
 *    Unless required by applicable law or agreed to in writing,
 
15
 *    software distributed under the License is distributed on an
 
16
 *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 
17
 *    KIND, either express or implied.  See the License for the
 
18
 *    specific language governing permissions and limitations
 
19
 *    under the License.
 
20
 * ====================================================================
 
21
 * @endcopyright
 
22
 */
 
23
 
 
24
package org.apache.subversion.javahl.util;
 
25
 
 
26
import org.apache.subversion.javahl.SVNUtil;
 
27
import org.apache.subversion.javahl.ClientException;
 
28
import org.apache.subversion.javahl.SubversionException;
 
29
import org.apache.subversion.javahl.NativeResources;
 
30
import org.apache.subversion.javahl.types.ExternalItem;
 
31
import org.apache.subversion.javahl.types.NodeKind;
 
32
import org.apache.subversion.javahl.types.Revision;
 
33
 
 
34
import java.util.List;
 
35
import java.io.InputStream;
 
36
 
 
37
/**
 
38
 * Encapsulates utility functions for properties provided by libsvn_wc.
 
39
 * @since 1.9
 
40
 */
 
41
public class PropLib
 
42
{
 
43
    /**
 
44
     * Load the required native library.
 
45
     */
 
46
    static
 
47
    {
 
48
        NativeResources.loadNativeLibrary();
 
49
    }
 
50
 
 
51
    /** @see SVNUtil#canonicalizeSvnProperty */
 
52
    public byte[] canonicalizeNodeProperty(String name, byte[] value,
 
53
                                           String path, NodeKind kind,
 
54
                                           String mimeType,
 
55
                                           InputStream fileContents)
 
56
        throws ClientException
 
57
    {
 
58
        if (!name.startsWith("svn:"))
 
59
            throw new IllegalArgumentException("Property name: " + name);
 
60
        return checkNodeProp(name, value, path, kind, mimeType, fileContents,
 
61
                             (kind != NodeKind.file || mimeType == null));
 
62
    }
 
63
 
 
64
    private native byte[] checkNodeProp(String name, byte[] value,
 
65
                                        String path, NodeKind kind,
 
66
                                        String mimeType,
 
67
                                        InputStream fileContents,
 
68
                                        boolean skipSomeChecks)
 
69
        throws ClientException;
 
70
 
 
71
 
 
72
    /** @see SVNUtil.parseExternals */
 
73
    public native List<ExternalItem> parseExternals(byte[] description,
 
74
                                                    String parentDirectory,
 
75
                                                    boolean canonicalizeUrl)
 
76
        throws ClientException;
 
77
 
 
78
    /** @see SVNUtil#unparseExternals */
 
79
    public native byte[] unparseExternals(List<ExternalItem> items,
 
80
                                          String parentDirectory,
 
81
                                          boolean old_format)
 
82
        throws SubversionException;
 
83
 
 
84
 
 
85
    /** @see SVNUtil#resolveExternalsUrl */
 
86
    public native String resolveExternalsUrl(ExternalItem external,
 
87
                                             String reposRootUrl,
 
88
                                             String parentDirUrl)
 
89
        throws ClientException;
 
90
}