This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from ca244aa Forward ported from 2.3-gae: Added
WhitelistMemberAccessPolicy and related internal classes
new aad5477 Forward ported from 2.3-gae: FREEMARKER-124: Changed
DefaultMemberAccessPolicy to block more methods. This caused some reworkings in
other classes too: - Constructor member selectors (in a whitelist or blacklist)
don't match constructors in subclasses anymore. - Added
BlacklistMemberAccessPolicy (by refactoring WhitelistMemberAccessPolicy to
extend MemberSelectorListMemberAccessPolicy). - Improved JavaDoc comments in
related classes
new 4941acd (Minor cleanup)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/freemarker/core/ConfigurationTest.java | 28 +
.../model/impl/DefaultMemberAccessPolicyTest.java | 143 +++++
...DefaultObjectWrapperMemberAccessPolicyTest.java | 208 +++++---
...ava => MemberSelectorListAccessPolicyTest.java} | 116 +++-
.../core/GetOptionalTemplateFunction.java | 4 +-
.../org/apache/freemarker/core/NativeSequence.java | 3 +-
.../freemarker/core/ProcessingConfiguration.java | 6 +
.../model/impl/BlacklistMemberAccessPolicy.java | 48 ++
.../core/model/impl/ConstructorMatcher.java | 5 +
.../core/model/impl/DefaultMemberAccessPolicy.java | 204 +++++---
.../freemarker/core/model/impl/FieldMatcher.java | 5 +
.../core/model/impl/MemberAccessPolicy.java | 23 +-
.../freemarker/core/model/impl/MemberMatcher.java | 14 +-
...a => MemberSelectorListMemberAccessPolicy.java} | 127 +++--
.../freemarker/core/model/impl/MethodMatcher.java | 5 +
.../model/impl/WhitelistMemberAccessPolicy.java | 388 +-------------
.../model/impl/DefaultMemberAccessPolicy-rules | 582 +++++++++++++++++++++
.../core/model/impl/unsafeMethods.properties | 98 ----
18 files changed, 1291 insertions(+), 716 deletions(-)
create mode 100644
freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultMemberAccessPolicyTest.java
rename
freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/{WhitelistMemberAccessPolicyTest.java
=> MemberSelectorListAccessPolicyTest.java} (84%)
create mode 100644
freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/BlacklistMemberAccessPolicy.java
copy
freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/{WhitelistMemberAccessPolicy.java
=> MemberSelectorListMemberAccessPolicy.java} (76%)
create mode 100644
freemarker-core/src/main/resources/org/apache/freemarker/core/model/impl/DefaultMemberAccessPolicy-rules
delete mode 100644
freemarker-core/src/main/resources/org/apache/freemarker/core/model/impl/unsafeMethods.properties