From dd01437171044ecb4cdc63998250a4d9f3277119 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Mon, 11 Feb 2013 13:16:44 -0500 Subject: Added CLI to manage user membership. New CLI's have been added to search, add, and remove user membership. The group member management code has been refactored into a processor to allow reuse. Ticket #190 --- .../src/com/netscape/cmstools/group/GroupCLI.java | 2 +- .../cmstools/user/UserAddMembershipCLI.java | 57 +++++++++++ .../src/com/netscape/cmstools/user/UserCLI.java | 14 +++ .../cmstools/user/UserFindMembershipCLI.java | 104 +++++++++++++++++++++ .../cmstools/user/UserRemoveMembershipCLI.java | 54 +++++++++++ 5 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserAddMembershipCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserFindMembershipCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserRemoveMembershipCLI.java (limited to 'base/java-tools') diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java index b2c38d808..75eeffd97 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java @@ -114,7 +114,7 @@ public class GroupCLI extends CLI { } public static void printGroupMember(GroupMemberData groupMemberData) { - System.out.println(" Member: "+groupMemberData.getID()); + System.out.println(" User: "+groupMemberData.getID()); Link link = groupMemberData.getLink(); if (verbose && link != null) { diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserAddMembershipCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserAddMembershipCLI.java new file mode 100644 index 000000000..e1b523ace --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserAddMembershipCLI.java @@ -0,0 +1,57 @@ +// --- BEGIN COPYRIGHT BLOCK --- +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// (C) 2013 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.user; + +import com.netscape.certsrv.user.UserMembershipData; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class UserAddMembershipCLI extends CLI { + + public UserCLI parent; + + public UserAddMembershipCLI(UserCLI parent) { + super("add-membership", "Add user membership"); + this.parent = parent; + } + + public void printHelp() { + formatter.printHelp(parent.name + "-" + name + " [OPTIONS...]", options); + } + + public void execute(String[] args) throws Exception { + + if (args.length != 2) { + printHelp(); + System.exit(1); + } + + String userID = args[0]; + String groupID = args[1]; + + UserMembershipData userMembershipData = parent.client.addUserMembership(userID, groupID); + + MainCLI.printMessage("Added membership in \""+groupID+"\""); + + UserCLI.printUserMembership(userMembershipData); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java index 8c24d1746..84dd6bae5 100644 --- a/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java @@ -26,6 +26,7 @@ import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.user.UserCertData; import com.netscape.certsrv.user.UserClient; import com.netscape.certsrv.user.UserData; +import com.netscape.certsrv.user.UserMembershipData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -51,6 +52,10 @@ public class UserCLI extends CLI { addModule(new UserShowCertCLI(this)); addModule(new UserAddCertCLI(this)); addModule(new UserRemoveCertCLI(this)); + + addModule(new UserFindMembershipCLI(this)); + addModule(new UserAddMembershipCLI(this)); + addModule(new UserRemoveMembershipCLI(this)); } public void printHelp() { @@ -159,4 +164,13 @@ public class UserCLI extends CLI { System.out.println(encoded); } } + + public static void printUserMembership(UserMembershipData userMembershipData) { + System.out.println(" Group: "+userMembershipData.getID()); + + Link link = userMembershipData.getLink(); + if (verbose && link != null) { + System.out.println(" Link: " + link.getHref()); + } + } } diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserFindMembershipCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserFindMembershipCLI.java new file mode 100644 index 000000000..494c3c323 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserFindMembershipCLI.java @@ -0,0 +1,104 @@ +// --- BEGIN COPYRIGHT BLOCK --- +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// (C) 2013 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.user; + +import java.util.Collection; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; + +import com.netscape.certsrv.user.UserMembershipCollection; +import com.netscape.certsrv.user.UserMembershipData; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class UserFindMembershipCLI extends CLI { + + public UserCLI parent; + + public UserFindMembershipCLI(UserCLI parent) { + super("find-membership", "Find user memberships"); + this.parent = parent; + } + + public void printHelp() { + formatter.printHelp(parent.name + "-" + name + " [OPTIONS...]", options); + } + + public void execute(String[] args) throws Exception { + + Option option = new Option(null, "start", true, "Page start"); + option.setArgName("start"); + options.addOption(option); + + option = new Option(null, "size", true, "Page size"); + option.setArgName("size"); + options.addOption(option); + + CommandLine cmd = null; + + try { + cmd = parser.parse(options, args); + + } catch (Exception e) { + System.err.println("Error: " + e.getMessage()); + printHelp(); + System.exit(1); + } + + String[] cmdArgs = cmd.getArgs(); + + if (cmdArgs.length != 1) { + printHelp(); + System.exit(1); + } + + String userID = cmdArgs[0]; + + String s = cmd.getOptionValue("start"); + Integer start = s == null ? null : Integer.valueOf(s); + + s = cmd.getOptionValue("size"); + Integer size = s == null ? null : Integer.valueOf(s); + + UserMembershipCollection response = parent.client.findUserMemberships(userID, start, size); + + Collection entries = response.getMemberships(); + + MainCLI.printMessage(entries.size()+" membership(s) matched"); + + boolean first = true; + + for (UserMembershipData userMembershipData : entries) { + + if (first) { + first = false; + } else { + System.out.println(); + } + + UserCLI.printUserMembership(userMembershipData); + } + + MainCLI.printMessage("Number of entries returned "+entries.size()); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserRemoveMembershipCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserRemoveMembershipCLI.java new file mode 100644 index 000000000..cab887a38 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserRemoveMembershipCLI.java @@ -0,0 +1,54 @@ +// --- BEGIN COPYRIGHT BLOCK --- +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// (C) 2013 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.user; + +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class UserRemoveMembershipCLI extends CLI { + + public UserCLI parent; + + public UserRemoveMembershipCLI(UserCLI parent) { + super("remove-membership", "Remove user membership"); + this.parent = parent; + } + + public void printHelp() { + formatter.printHelp(parent.name + "-" + name + " [OPTIONS...]", options); + } + + public void execute(String[] args) throws Exception { + + if (args.length != 2) { + printHelp(); + System.exit(1); + } + + String userID = args[0]; + String groupID = args[1]; + + parent.client.removeUserMembership(userID, groupID); + + MainCLI.printMessage("Deleted membership in group \""+groupID+"\""); + } +} -- cgit