Skip to content

Commit 9bef1f6

Browse files
committed
Update CHANGELOG and docs to more accurately reflect the necessarily imperfect detection of the locality of JNDI names.
1 parent c6f5d11 commit 9bef1f6

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CHANGELOG

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
custom environment. Define properties-style config parameter
1111
com.mchange.v2.naming.acceptDeserializedInitialContextEnvironment, defaulting to false,
1212
to manage this dangerous functionality.
13-
-- Disable by default JNDI lookups of nonlocal names (conservatively, names we cannot prove to be local).
14-
For now only String names beginning with "java:" are considered provably local.
13+
-- Disable by default JNDI lookups of nonlocal names (conservatively, names that do not seem to be local).
14+
For now only String names beginning with "java:" or Name objects whose first component starts with
15+
"java:" are considered to be local.
1516
Define properties-style config parameter com.mchange.v2.naming.permitNonlocalJndiNames, defaulting
1617
to false, to manage this dangerous functionality.
1718
-- Disable by default support for loading of javax.naming.spi.ObjectFactory from remote locations

doc/docsrc/index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1956,7 +1956,9 @@ <h3>
19561956
<dd>
19571957
<div class="propdesc">
19581958
<tt>false</tt> by default. If reset to <tt>true</tt>, utilities like <tt>JndiRefForwardingDataSource</tt> will be permitted
1959-
to look up resources from remote name services. Otherwise JNDI lookups are restricted to the local <tt>java:</tt> namespace.
1959+
to make lookups that are suspected of being to remote name services. When false, JNDI lookups are restricted to names beginning
1960+
with "<tt>java:</tt>" JNDI is too malleable to make strong guarantees about this: Any name can be interpreted any way, depending
1961+
on how JNDI is configured. But under most common configurations <tt>java:</tt> prefixed names should be to local resources.
19601962
</div>
19611963
</dd>
19621964
<dt><a name="com.mchange.v2.naming.acceptDeserializedInitialContextEnvironment"></a>com.mchange.v2.naming.acceptDeserializedInitialContextEnvironment</dt>

0 commit comments

Comments
 (0)