Attachment 23673 Details for Bug 60610

[patch] common.patch

common.patch (text/plain), 4.09 KB, created by Marcus Meissner on 2004-09-20 15:55:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2004-09-20 15:55:15 UTC

Size: 4.09 KB

patch

obsolete

>Security fix for 1.0.  Common changes shared by all the different
>patches.  Apply this patch first.
>
>* mod_dav_svn/dav_svn.h
>  (dav_svn_authz_read, dav_svn_authz_baton): new library-level
>      declarations of things that were formerly static.
>
>* mod_dav_svn/update.c
>  (authz_read_baton):  remove local declaration.
>  (dav_svn_authz_read):  new name of formerly static 'authz_read'.
>  (dav_svn__update_report):  update caller to use new symbol names.
>
>
>Index: subversion/mod_dav_svn/update.c
>===================================================================
>--- subversion/mod_dav_svn/update.c	(revision 10978)
>+++ subversion/mod_dav_svn/update.c	(working copy)
>@@ -102,24 +102,13 @@
> #define DIR_OR_FILE(is_dir) ((is_dir) ? "directory" : "file")
> 
> 
>-struct authz_read_baton
>+svn_error_t *dav_svn_authz_read(svn_boolean_t *allowed,
>+                                svn_fs_root_t *root,
>+                                const char *path,
>+                                void *baton,
>+                                apr_pool_t *pool)
> {
>-  /* The original request, needed to generate a subrequest. */
>-  request_rec *r;
>-
>-  /* We need this to construct a URI based on a repository abs path. */
>-  const dav_svn_repos *repos;
>-};
>-
>-
>-/* This implements 'svn_repos_authz_func_t'. */
>-static svn_error_t *authz_read(svn_boolean_t *allowed,
>-                               svn_fs_root_t *root,
>-                               const char *path,
>-                               void *baton,
>-                               apr_pool_t *pool)
>-{
>-  struct authz_read_baton *arb = baton;
>+  dav_svn_authz_read_baton *arb = baton;
>   request_rec *subreq = NULL;
>   const char *uri;
>   svn_revnum_t rev = SVN_INVALID_REVNUM;
>@@ -1002,7 +991,7 @@
>   svn_boolean_t recurse = TRUE;
>   svn_boolean_t resource_walk = FALSE;
>   svn_boolean_t ignore_ancestry = FALSE;
>-  struct authz_read_baton arb;
>+  dav_svn_authz_read_baton arb;
>   apr_pool_t *subpool = svn_pool_create(resource->pool);
> 
>   /* Construct the authz read check baton. */
>@@ -1243,7 +1232,7 @@
>                                      recurse,
>                                      ignore_ancestry,
>                                      editor, &uc,
>-                                     authz_read,
>+                                     dav_svn_authz_read,
>                                      &arb,
>                                      resource->pool)))
>     {
>@@ -1412,7 +1401,7 @@
>                                      uc.rev_root, dst_path,
>                                      /* re-use the editor */
>                                      editor, &uc,
>-                                     authz_read,
>+                                     dav_svn_authz_read,
>                                      &arb,
>                                      FALSE, /* no text deltas */
>                                      recurse,
>Index: subversion/mod_dav_svn/dav_svn.h
>===================================================================
>--- subversion/mod_dav_svn/dav_svn.h	(revision 10978)
>+++ subversion/mod_dav_svn/dav_svn.h	(working copy)
>@@ -506,6 +506,38 @@
> 
> 
> 
>+
>+/* A baton needed by dav_svn_authz_read(). */
>+typedef struct 
>+{
>+  /* The original request, needed to generate a subrequest. */
>+  request_rec *r;
>+
>+  /* We need this to construct a URI based on a repository abs path. */
>+  const dav_svn_repos *repos;
>+
>+} dav_svn_authz_read_baton;
>+
>+
>+/* This function implements 'svn_repos_authz_func_t', specifically
>+   for read authorization.
>+
>+   Convert incoming ROOT and PATH into a version-resource URI and
>+   perform a GET subrequest on it.  This will invoke any authz modules
>+   loaded into apache.  Set *ALLOWED to TRUE if the subrequest
>+   succeeds, FALSE otherwise.
>+
>+   BATON must be a pointer to a dav_svn_authz_read_baton (see above).
>+   Use POOL for for any temporary allocation.
>+*/
>+svn_error_t *dav_svn_authz_read(svn_boolean_t *allowed,
>+                                svn_fs_root_t *root,
>+                                const char *path,
>+                                void *baton,
>+                                apr_pool_t *pool);
>+
>+
>+
> #ifdef __cplusplus
> }
> #endif /* __cplusplus */

Actions: View | Diff

Attachments on bug 60610: 23673 | 23674 | 23675