diff options
4 files changed, 259 insertions, 1 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch new file mode 100644 index 0000000000..a54d6944ed --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch @@ -0,0 +1,130 @@ +Upstream-Status: Backport + +Index: tools/server-side/mod_dontdothat/mod_dontdothat.c +=================================================================== +--- a/tools/server-side/mod_dontdothat/mod_dontdothat.c (revision 1239695) ++++ b/tools/server-side/mod_dontdothat/mod_dontdothat.c (revision 1542078) +@@ -30,12 +30,15 @@ + #include <util_filter.h> + #include <ap_config.h> + #include <apr_strings.h> ++#include <apr_uri.h> + + #include <expat.h> + + #include "mod_dav_svn.h" + #include "svn_string.h" + #include "svn_config.h" ++#include "svn_path.h" ++#include "private/svn_fspath.h" + + module AP_MODULE_DECLARE_DATA dontdothat_module; + +@@ -161,26 +164,71 @@ + } + } + ++/* duplicate of dav_svn__log_err() from mod_dav_svn/util.c */ ++static void ++log_dav_err(request_rec *r, ++ dav_error *err, ++ int level) ++{ ++ dav_error *errscan; ++ ++ /* Log the errors */ ++ /* ### should have a directive to log the first or all */ ++ for (errscan = err; errscan != NULL; errscan = errscan->prev) { ++ apr_status_t status; ++ ++ if (errscan->desc == NULL) ++ continue; ++ ++#if AP_MODULE_MAGIC_AT_LEAST(20091119,0) ++ status = errscan->aprerr; ++#else ++ status = errscan->save_errno; ++#endif ++ ++ ap_log_rerror(APLOG_MARK, level, status, r, ++ "%s [%d, #%d]", ++ errscan->desc, errscan->status, errscan->error_id); ++ } ++} ++ + static svn_boolean_t + is_this_legal(dontdothat_filter_ctx *ctx, const char *uri) + { + const char *relative_path; + const char *cleaned_uri; + const char *repos_name; ++ const char *uri_path; + int trailing_slash; + dav_error *derr; + +- /* Ok, so we need to skip past the scheme, host, etc. */ +- uri = ap_strstr_c(uri, "://"); +- if (uri) +- uri = ap_strchr_c(uri + 3, '/'); ++ /* uri can be an absolute uri or just a path, we only want the path to match ++ * against */ ++ if (uri && svn_path_is_url(uri)) ++ { ++ apr_uri_t parsed_uri; ++ apr_status_t rv = apr_uri_parse(ctx->r->pool, uri, &parsed_uri); ++ if (APR_SUCCESS != rv) ++ { ++ /* Error parsing the URI, log and reject request. */ ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, ctx->r, ++ "mod_dontdothat: blocked request after failing " ++ "to parse uri: '%s'", uri); ++ return FALSE; ++ } ++ uri_path = parsed_uri.path; ++ } ++ else ++ { ++ uri_path = uri; ++ } + +- if (uri) ++ if (uri_path) + { + const char *repos_path; + + derr = dav_svn_split_uri(ctx->r, +- uri, ++ uri_path, + ctx->cfg->base_path, + &cleaned_uri, + &trailing_slash, +@@ -194,7 +242,7 @@ + if (! repos_path) + repos_path = ""; + +- repos_path = apr_psprintf(ctx->r->pool, "/%s", repos_path); ++ repos_path = svn_fspath__canonicalize(repos_path, ctx->r->pool); + + /* First check the special cases that are always legal... */ + for (idx = 0; idx < ctx->allow_recursive_ops->nelts; ++idx) +@@ -228,7 +276,20 @@ + } + } + } ++ else ++ { ++ log_dav_err(ctx->r, derr, APLOG_ERR); ++ return FALSE; ++ } ++ + } ++ else ++ { ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, ++ "mod_dontdothat: empty uri passed to is_this_legal(), " ++ "module bug?"); ++ return FALSE; ++ } + + return TRUE; + } diff --git a/meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-4505.patch b/meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-4505.patch new file mode 100644 index 0000000000..7d73a6b2f3 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-4505.patch @@ -0,0 +1,127 @@ +Upstream-Status: Backport + +--- ./contrib/server-side/mod_dontdothat/mod_dontdothat.c.old 2014-04-15 10:18:54.692655905 +0800 ++++ ./contrib/server-side/mod_dontdothat/mod_dontdothat.c 2014-04-15 10:29:55.559603676 +0800 +@@ -25,12 +25,15 @@ + #include <util_filter.h> + #include <ap_config.h> + #include <apr_strings.h> ++#include <apr_uri.h> + + #include <expat.h> + + #include "mod_dav_svn.h" + #include "svn_string.h" + #include "svn_config.h" ++#include "svn_path.h" ++#include "private/svn_fspath.h" + + module AP_MODULE_DECLARE_DATA dontdothat_module; + +@@ -156,26 +159,71 @@ matches(const char *wc, const char *p) + } + } + ++/* duplicate of dav_svn__log_err() from mod_dav_svn/util.c */ ++static void ++log_dav_err(request_rec *r, ++ dav_error *err, ++ int level) ++{ ++ dav_error *errscan; ++ ++ /* Log the errors */ ++ /* ### should have a directive to log the first or all */ ++ for (errscan = err; errscan != NULL; errscan = errscan->prev) { ++ apr_status_t status; ++ ++ if (errscan->desc == NULL) ++ continue; ++ ++#if AP_MODULE_MAGIC_AT_LEAST(20091119,0) ++ status = errscan->aprerr; ++#else ++ status = errscan->save_errno; ++#endif ++ ++ ap_log_rerror(APLOG_MARK, level, status, r, ++ "%s [%d, #%d]", ++ errscan->desc, errscan->status, errscan->error_id); ++ } ++} ++ + static svn_boolean_t + is_this_legal(dontdothat_filter_ctx *ctx, const char *uri) + { + const char *relative_path; + const char *cleaned_uri; + const char *repos_name; ++ const char *uri_path; + int trailing_slash; + dav_error *derr; + +- /* Ok, so we need to skip past the scheme, host, etc. */ +- uri = ap_strstr_c(uri, "://"); +- if (uri) +- uri = ap_strchr_c(uri + 3, '/'); ++ /* uri can be an absolute uri or just a path, we only want the path to match ++ * against */ ++ if (uri && svn_path_is_url(uri)) ++ { ++ apr_uri_t parsed_uri; ++ apr_status_t rv = apr_uri_parse(ctx->r->pool, uri, &parsed_uri); ++ if (APR_SUCCESS != rv) ++ { ++ /* Error parsing the URI, log and reject request. */ ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, ctx->r, ++ "mod_dontdothat: blocked request after failing " ++ "to parse uri: '%s'", uri); ++ return FALSE; ++ } ++ uri_path = parsed_uri.path; ++ } ++ else ++ { ++ uri_path = uri; ++ } + +- if (uri) ++ if (uri_path) + { + const char *repos_path; + + derr = dav_svn_split_uri(ctx->r, +- uri, ++ uri_path, + ctx->cfg->base_path, + &cleaned_uri, + &trailing_slash, +@@ -189,7 +237,7 @@ is_this_legal(dontdothat_filter_ctx *ctx + if (! repos_path) + repos_path = ""; + +- repos_path = apr_psprintf(ctx->r->pool, "/%s", repos_path); ++ repos_path = svn_fspath__canonicalize(repos_path, ctx->r->pool); + + /* First check the special cases that are always legal... */ + for (idx = 0; idx < ctx->allow_recursive_ops->nelts; ++idx) +@@ -223,6 +271,19 @@ is_this_legal(dontdothat_filter_ctx *ctx + } + } + } ++ else ++ { ++ log_dav_err(ctx->r, derr, APLOG_ERR); ++ return FALSE; ++ } ++ ++ } ++ else ++ { ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, ++ "mod_dontdothat: empty uri passed to is_this_legal(), " ++ "module bug?"); ++ return FALSE; + } + + return TRUE; diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb index 74cd149750..cb362765ab 100644 --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb +++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb @@ -14,7 +14,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \ file://libtool2.patch \ file://fix-install-depends.patch \ file://subversion-CVE-2013-1849.patch \ - " + file://subversion-CVE-2013-4505.patch" SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69" SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45" diff --git a/meta/recipes-devtools/subversion/subversion_1.7.10.bb b/meta/recipes-devtools/subversion/subversion_1.7.10.bb index acef3bd62d..011d51b613 100644 --- a/meta/recipes-devtools/subversion/subversion_1.7.10.bb +++ b/meta/recipes-devtools/subversion/subversion_1.7.10.bb @@ -14,6 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://fix-install-depends.patch \ file://allow-updated-neon.patch \ file://neon.m4-fix-includes-and-cflags.patch \ + file://subversion-CVE-2013-4505.patch \ " SRC_URI[md5sum] = "4088a77e14232876c9b4ff1541e6e200" SRC_URI[sha256sum] = "c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7" |