Skip to content

Commit 269126a

Browse files
committed
xforms to restore site
[skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922996 13f79535-47bb-0310-9956-ffa450edef68
1 parent a9cea52 commit 269126a

File tree

122 files changed

+897
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+897
-133
lines changed

docs/manual/mod/directives.html.en

Lines changed: 575 additions & 12 deletions
Large diffs are not rendered by default.

docs/manual/mod/index.html.en

Lines changed: 174 additions & 1 deletion
Large diffs are not rendered by default.

docs/manual/mod/mod_authnz_ldap.html.en

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ for HTTP Basic authentication.</td></tr>
130130
<li><a href="#reqdn">Require ldap-dn</a></li>
131131
<li><a href="#reqattribute">Require ldap-attribute</a></li>
132132
<li><a href="#reqfilter">Require ldap-filter</a></li>
133+
<li><a href="#reqsearch">Require ldap-search</a></li>
133134
</ul>
134135
</li>
135136

@@ -271,6 +272,11 @@ in <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> for d
271272
directive, and the search filter successfully finds a single user
272273
object that matches the dn of the authenticated user.</li>
273274

275+
<li>Grant access if there is a <a href="#reqsearch">
276+
<code>Require ldap-search</code></a>
277+
directive, and the search filter successfully returns a single
278+
matching object with any distinguished name.</li>
279+
274280
<li>otherwise, deny or decline access</li>
275281
</ul>
276282

@@ -541,6 +547,27 @@ AuthLDAPMaxSubGroupDepth 1</pre>
541547

542548

543549

550+
<h3><a name="reqsearch" id="reqsearch">Require ldap-search</a></h3>
551+
552+
<p>The <code>Require ldap-search</code> directive allows the
553+
administrator to grant access based on a generic LDAP search filter using an
554+
<a href="../expr.html">expression</a>. If there is exactly one match to the search filter,
555+
regardless of the distinguished name, access is granted.</p>
556+
557+
<p>The following directive would grant access to URLs that match the given objects in the
558+
LDAP server:</p>
559+
560+
<pre class="prettyprint lang-config">&lt;LocationMatch ^/dav/(?&lt;SITENAME&gt;[^/]+)/&gt;
561+
Require ldap-search (cn=%{ldap:%{unescape:%{env:MATCH_SITENAME}} Website)
562+
&lt;/LocationMatch&gt;</pre>
563+
564+
565+
<p>Note: care must be taken to ensure that any expressions are properly escaped to guard
566+
against LDAP injection. The <strong>ldap</strong> function can be used as per the example
567+
above.</p>
568+
569+
570+
544571
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
545572
<div class="section">
546573
<h2><a name="examples" id="examples">Examples</a></h2>
@@ -1426,7 +1453,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_authnz_ldap.
14261453
}
14271454
})(window, document);
14281455
//--><!]]></script></div><div id="footer">
1429-
<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
1456+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
14301457
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
14311458
if (typeof(prettyPrint) !== 'undefined') {
14321459
prettyPrint();

docs/manual/mod/mod_authnz_ldap.xml.fr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
33
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
4-
<!-- English Revision: 1898251:1922957 (outdated) -->
4+
<!-- English Revision: 1898251:1922995 (outdated) -->
55
<!-- French translation : Lucien GENTIS -->
66
<!-- Reviewed by : Vincent Deffontaines -->
77

docs/manual/mod/mod_authz_core.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_authz_core.h
680680
}
681681
})(window, document);
682682
//--><!]]></script></div><div id="footer">
683-
<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
683+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
684684
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
685685
if (typeof(prettyPrint) !== 'undefined') {
686686
prettyPrint();

docs/manual/mod/mod_authz_dbd.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_authz_dbd.ht
306306
}
307307
})(window, document);
308308
//--><!]]></script></div><div id="footer">
309-
<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
309+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
310310
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
311311
if (typeof(prettyPrint) !== 'undefined') {
312312
prettyPrint();

docs/manual/mod/mod_authz_dbm.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_authz_dbm.ht
206206
}
207207
})(window, document);
208208
//--><!]]></script></div><div id="footer">
209-
<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
209+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
210210
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
211211
if (typeof(prettyPrint) !== 'undefined') {
212212
prettyPrint();

docs/manual/mod/mod_authz_groupfile.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_authz_groupf
149149
}
150150
})(window, document);
151151
//--><!]]></script></div><div id="footer">
152-
<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
152+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
153153
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
154154
if (typeof(prettyPrint) !== 'undefined') {
155155
prettyPrint();

docs/manual/mod/mod_authz_host.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_authz_host.h
244244
}
245245
})(window, document);
246246
//--><!]]></script></div><div id="footer">
247-
<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
247+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
248248
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
249249
if (typeof(prettyPrint) !== 'undefined') {
250250
prettyPrint();

docs/manual/mod/mod_authz_owner.html.en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_authz_owner.
160160
}
161161
})(window, document);
162162
//--><!]]></script></div><div id="footer">
163-
<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
163+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
164164
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
165165
if (typeof(prettyPrint) !== 'undefined') {
166166
prettyPrint();

0 commit comments

Comments
 (0)