You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2022/04/08 20:42:55 UTC
[directory-fortress-commander] branch wicket9 updated (13a8fed -> 58de4f0)
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a change to branch wicket9
in repository https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
from 13a8fed FC-310 - Wicket 9 Upgrade
new 384022f was always outputting perm not found message
new 8994db2 group page not showing search button and search modal erroneously req'd protocol field set
new d6169e0 fix broken search button
new 13ffe31 cleanup
new 58de4f0 get the group and audit mod test cases working
The 5 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:
.../web/control/SecureIndicatingAjaxButton.java | 2 ++
.../fortress/web/panel/GroupDetailPanel.java | 2 +-
.../fortress/web/panel/GroupListPanel.java | 4 +--
.../fortress/web/panel/RoleListPanel.java | 5 ++-
src/main/resources/FortressWebDemoUsers.xml | 5 ++-
.../web/integration/FortressWebSeleniumITCase.java | 37 ++++++++++++++++------
6 files changed, 38 insertions(+), 17 deletions(-)
[directory-fortress-commander] 03/05: fix broken search button
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch wicket9
in repository https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
commit d6169e0e2162f29d68fc0facdf2e47e64e4ed028
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Fri Apr 8 14:24:19 2022 -0500
fix broken search button
---
.../java/org/apache/directory/fortress/web/panel/RoleListPanel.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
index e8ccdb2..9fcc970 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
@@ -178,9 +178,8 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
/** Default serialVersionUID */
private static final long serialVersionUID = 1L;
-
- //@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ @Override
+ protected void onSubmit( AjaxRequestTarget target )
{
LOG.debug( ".search onSubmit" );
info( "Searching Roles..." );
[directory-fortress-commander] 04/05: cleanup
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch wicket9
in repository https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
commit 13ffe314699e4e4f1686641603cb9711c9212f8c
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Fri Apr 8 15:31:02 2022 -0500
cleanup
---
.../java/org/apache/directory/fortress/web/panel/GroupListPanel.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
index 42b8473..31e49d3 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
@@ -344,7 +344,6 @@ public class GroupListPanel extends FormComponentPanel
}
} );
-// memberRb.add( new SecureIndicatingAjaxLink( "memberAssignLinkLbl", GlobalIds.REVIEW_MGR, "findUsers" )
memberRb.add( new SecureIndicatingAjaxLink( "memberAssignLinkLbl", GlobalIds.GROUP_MGR, "findUsers" )
{
/** Default serialVersionUID */
[directory-fortress-commander] 02/05: group page not showing search button and search modal erroneously req'd protocol field set
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch wicket9
in repository https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
commit 8994db27f702d59ef6267685af9ff37e279176e2
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Fri Apr 8 13:45:14 2022 -0500
group page not showing search button and search modal erroneously req'd protocol field set
---
.../org/apache/directory/fortress/web/panel/GroupDetailPanel.java | 2 +-
.../org/apache/directory/fortress/web/panel/GroupListPanel.java | 5 ++---
src/main/resources/FortressWebDemoUsers.xml | 6 +++++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
index 0fb5976..8ee7936 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
@@ -125,11 +125,11 @@ public class GroupDetailPanel extends FormComponentPanel
add( name );
name.setRequired( false );
TextField protocol = new TextField( "protocol" );
+ protocol.setRequired( false );
add( protocol );
TextField description = new TextField( "description" );
description.setRequired( false );
add( description );
- protocol.setRequired( true );
memberPropsCB = new ComboBox<>( "memberProps", new PropertyModel<String>( this,
"memberPropsSelection" ), new ArrayList<String>() );
memberPropsCB.setOutputMarkupId( true );
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
index 3c03f15..42b8473 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
@@ -124,10 +124,8 @@ public class GroupListPanel extends FormComponentPanel
/** Default serialVersionUID */
private static final long serialVersionUID = 1L;
-
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form form )
{
LOG.debug( ".search.onSubmit selected radio button: " + selectedRadioButton );
info( "Searching Group Objects..." );
@@ -346,7 +344,8 @@ public class GroupListPanel extends FormComponentPanel
}
} );
- memberRb.add( new SecureIndicatingAjaxLink( "memberAssignLinkLbl", GlobalIds.REVIEW_MGR, "findUsers" )
+// memberRb.add( new SecureIndicatingAjaxLink( "memberAssignLinkLbl", GlobalIds.REVIEW_MGR, "findUsers" )
+ memberRb.add( new SecureIndicatingAjaxLink( "memberAssignLinkLbl", GlobalIds.GROUP_MGR, "findUsers" )
{
/** Default serialVersionUID */
private static final long serialVersionUID = 1L;
diff --git a/src/main/resources/FortressWebDemoUsers.xml b/src/main/resources/FortressWebDemoUsers.xml
index f66c57c..2db88a8 100644
--- a/src/main/resources/FortressWebDemoUsers.xml
+++ b/src/main/resources/FortressWebDemoUsers.xml
@@ -129,6 +129,10 @@
<permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-audit-admin" admin="true"/>
<permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findPermissions" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.impl.GroupMgrImpl" opName="read" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.impl.GroupMgrImpl" opName="find" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.impl.GroupMgrImpl" opName="findWithUsers" roleNm="fortress-web-audit-admin" admin="true"/>
+
<permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="readUser" roleNm="fortress-web-user-admin" admin="true"/>
<permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-user-admin" admin="true"/>
<permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="assignedUsers" roleNm="fortress-web-user-admin" admin="true"/>
@@ -181,4 +185,4 @@
</FortressAdmin>
</target>
-</project>
\ No newline at end of file
+</project>
[directory-fortress-commander] 05/05: get the group and audit mod test cases working
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch wicket9
in repository https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
commit 58de4f0edb935293d0be44651fa70d687445cd63
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Fri Apr 8 15:31:46 2022 -0500
get the group and audit mod test cases working
---
src/main/resources/FortressWebDemoUsers.xml | 1 -
.../web/integration/FortressWebSeleniumITCase.java | 37 ++++++++++++++++------
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/FortressWebDemoUsers.xml b/src/main/resources/FortressWebDemoUsers.xml
index 2db88a8..3012c13 100644
--- a/src/main/resources/FortressWebDemoUsers.xml
+++ b/src/main/resources/FortressWebDemoUsers.xml
@@ -128,7 +128,6 @@
<permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="readUser" roleNm="fortress-web-audit-admin" admin="true"/>
<permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-audit-admin" admin="true"/>
<permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findPermissions" roleNm="fortress-web-audit-admin" admin="true"/>
-
<permgrant objName="org.apache.directory.fortress.core.impl.GroupMgrImpl" opName="read" roleNm="fortress-web-audit-admin" admin="true"/>
<permgrant objName="org.apache.directory.fortress.core.impl.GroupMgrImpl" opName="find" roleNm="fortress-web-audit-admin" admin="true"/>
<permgrant objName="org.apache.directory.fortress.core.impl.GroupMgrImpl" opName="findWithUsers" roleNm="fortress-web-audit-admin" admin="true"/>
diff --git a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
index be90f2f..892ec6a 100644
--- a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
+++ b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
@@ -86,7 +86,7 @@ public class FortressWebSeleniumITCase
{
// http default:
baseUrl = "http://localhost:8080";
- //baseUrl = "http://fortress-a:8080";
+ //baseUrl = "https://fortress-a:8443";
driver.manage().timeouts().implicitlyWait( 5, TimeUnit.SECONDS );
}
@@ -162,15 +162,7 @@ public class FortressWebSeleniumITCase
admrles();
admobjs();
admperms();
- plcys();
groups();
-
- if( Config.getInstance().isOpenldap())
- {
- binds();
- authzs();
- mods();
- }
}
/*****
@@ -199,6 +191,33 @@ public class FortressWebSeleniumITCase
doNegativeLinkTest( ADMOBJS, "ObjectAdminPage", "test1" );
}
+ @Test
+ public void testCase3() throws Exception
+ {
+ LOG.info( "Begin FortressWebSeleniumITCase 3" );
+ driver.get( baseUrl + FORTRESS_WEB );
+ login( "test2", "password" );
+ TUtils.sleep( 1 );
+ if( Config.getInstance().isOpenldap())
+ {
+ plcys();
+ binds();
+ authzs();
+ // mods requires that: is.arbac02=true
+ mods();
+ }
+
+ doNegativeLinkTest( ROLES, "RolePage", "test1" );
+ doNegativeLinkTest( POBJS, "ObjectPage", "test1" );
+ doNegativeLinkTest( PERMS, "PermPage", "test1" );
+ doNegativeLinkTest( SSDS, "SdStaticPage", "test1" );
+ doNegativeLinkTest( DSDS, "SdDynamicPage", "test1" );
+ doNegativeLinkTest( OUSERS, "OuUserPage", "test1" );
+ doNegativeLinkTest( OUPRMS, "OuPermPage", "test1" );
+ doNegativeLinkTest( ADMRLES, "RoleAdminPage", "test1" );
+ doNegativeLinkTest( ADMOBJS, "ObjectAdminPage", "test1" );
+ }
+
private void login( String userId, String password )
{
driver.findElement( By.id( GlobalIds.USER_ID ) ).clear();
[directory-fortress-commander] 01/05: was always outputting perm not found message
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch wicket9
in repository https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
commit 384022f885963dc3eaf258f96155ab3ab23830de
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Fri Apr 8 13:43:45 2022 -0500
was always outputting perm not found message
---
.../directory/fortress/web/control/SecureIndicatingAjaxButton.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java b/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
index cd9d99d..990be4b 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
@@ -85,8 +85,10 @@ public class SecureIndicatingAjaxButton extends IndicatingAjaxButton
super( id );
LOG.debug( "load button perm objName: " + objName + " opName: " + opName);
if ( !SecUtils.isFound( new Permission( objName, opName ), this ) )
+ {
setVisible( false );
LOG.info( "perm objName: " + objName + " opName: " + opName + ", not found in session");
+ }
}
protected boolean checkAccess( String objectName, String opName )