From f9a4be1cf5b57afec59b0b96a46ff13317a039bf Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 3 Oct 2013 16:48:08 -0400 Subject: Fixed user and group commands. The commands for user certificates, user memberships, and group members have been renamed to be more consistent such that they can be parsed correctly. --- .../netscape/cmstools/group/GroupAddMemberCLI.java | 57 ----------- .../src/com/netscape/cmstools/group/GroupCLI.java | 15 +-- .../cmstools/group/GroupFindMemberCLI.java | 104 --------------------- .../netscape/cmstools/group/GroupMemberAddCLI.java | 57 +++++++++++ .../netscape/cmstools/group/GroupMemberCLI.java | 59 ++++++++++++ .../cmstools/group/GroupMemberFindCLI.java | 104 +++++++++++++++++++++ .../cmstools/group/GroupMemberRemoveCLI.java | 54 +++++++++++ .../cmstools/group/GroupMemberShowCLI.java | 57 +++++++++++ .../cmstools/group/GroupRemoveMemberCLI.java | 54 ----------- .../cmstools/group/GroupShowMemberCLI.java | 57 ----------- .../com/netscape/cmstools/user/UserAddCertCLI.java | 97 ------------------- .../cmstools/user/UserAddMembershipCLI.java | 57 ----------- .../src/com/netscape/cmstools/user/UserCLI.java | 49 +--------- .../com/netscape/cmstools/user/UserCertAddCLI.java | 97 +++++++++++++++++++ .../com/netscape/cmstools/user/UserCertCLI.java | 79 ++++++++++++++++ .../netscape/cmstools/user/UserCertFindCLI.java | 104 +++++++++++++++++++++ .../netscape/cmstools/user/UserCertRemoveCLI.java | 61 ++++++++++++ .../netscape/cmstools/user/UserCertShowCLI.java | 96 +++++++++++++++++++ .../netscape/cmstools/user/UserFindCertCLI.java | 104 --------------------- .../cmstools/user/UserFindMembershipCLI.java | 104 --------------------- .../cmstools/user/UserMembershipAddCLI.java | 57 +++++++++++ .../netscape/cmstools/user/UserMembershipCLI.java | 58 ++++++++++++ .../cmstools/user/UserMembershipFindCLI.java | 104 +++++++++++++++++++++ .../cmstools/user/UserMembershipRemoveCLI.java | 54 +++++++++++ .../netscape/cmstools/user/UserRemoveCertCLI.java | 61 ------------ .../cmstools/user/UserRemoveMembershipCLI.java | 54 ----------- .../netscape/cmstools/user/UserShowCertCLI.java | 96 ------------------- 27 files changed, 1044 insertions(+), 906 deletions(-) delete mode 100644 base/java-tools/src/com/netscape/cmstools/group/GroupAddMemberCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/group/GroupFindMemberCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/group/GroupMemberAddCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/group/GroupMemberCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/group/GroupMemberShowCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/group/GroupRemoveMemberCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/group/GroupShowMemberCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserAddCertCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserAddMembershipCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserCertAddCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserCertCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserCertShowCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserFindCertCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserFindMembershipCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserMembershipAddCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserMembershipCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java create mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserMembershipRemoveCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserRemoveCertCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserRemoveMembershipCLI.java delete mode 100644 base/java-tools/src/com/netscape/cmstools/user/UserShowCertCLI.java (limited to 'base/java-tools/src/com/netscape/cmstools') diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupAddMemberCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupAddMemberCLI.java deleted file mode 100644 index eb2f9bede..000000000 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupAddMemberCLI.java +++ /dev/null @@ -1,57 +0,0 @@ -// --- 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) 2012 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- - -package com.netscape.cmstools.group; - -import com.netscape.certsrv.group.GroupMemberData; -import com.netscape.cmstools.cli.CLI; -import com.netscape.cmstools.cli.MainCLI; - -/** - * @author Endi S. Dewata - */ -public class GroupAddMemberCLI extends CLI { - - public GroupCLI groupCLI; - - public GroupAddMemberCLI(GroupCLI groupCLI) { - super("add-member", "Add group member", groupCLI); - this.groupCLI = groupCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " ", options); - } - - public void execute(String[] args) throws Exception { - - if (args.length != 2) { - printHelp(); - System.exit(1); - } - - String groupID = args[0]; - String memberID = args[1]; - - GroupMemberData groupMemberData = groupCLI.groupClient.addGroupMember(groupID, memberID); - - MainCLI.printMessage("Added group member \""+memberID+"\""); - - GroupCLI.printGroupMember(groupMemberData); - } -} 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 dba9d9ab3..973e0bae6 100644 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java @@ -23,7 +23,6 @@ import org.jboss.resteasy.plugins.providers.atom.Link; import com.netscape.certsrv.group.GroupClient; import com.netscape.certsrv.group.GroupData; -import com.netscape.certsrv.group.GroupMemberData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -43,10 +42,7 @@ public class GroupCLI extends CLI { addModule(new GroupModifyCLI(this)); addModule(new GroupRemoveCLI(this)); - addModule(new GroupFindMemberCLI(this)); - addModule(new GroupShowMemberCLI(this)); - addModule(new GroupAddMemberCLI(this)); - addModule(new GroupRemoveMemberCLI(this)); + addModule(new GroupMemberCLI(this)); } public String getFullName() { @@ -87,13 +83,4 @@ public class GroupCLI extends CLI { System.out.println(" Link: " + link.getHref()); } } - - public static void printGroupMember(GroupMemberData groupMemberData) { - System.out.println(" User: "+groupMemberData.getID()); - - Link link = groupMemberData.getLink(); - if (verbose && link != null) { - System.out.println(" Link: " + link.getHref()); - } - } } diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupFindMemberCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupFindMemberCLI.java deleted file mode 100644 index 383e547f3..000000000 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupFindMemberCLI.java +++ /dev/null @@ -1,104 +0,0 @@ -// --- 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) 2012 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- - -package com.netscape.cmstools.group; - -import java.util.Collection; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; - -import com.netscape.certsrv.group.GroupMemberCollection; -import com.netscape.certsrv.group.GroupMemberData; -import com.netscape.cmstools.cli.CLI; -import com.netscape.cmstools.cli.MainCLI; - -/** - * @author Endi S. Dewata - */ -public class GroupFindMemberCLI extends CLI { - - public GroupCLI groupCLI; - - public GroupFindMemberCLI(GroupCLI groupCLI) { - super("find-member", "Find group members", groupCLI); - this.groupCLI = groupCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " [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 groupID = 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); - - GroupMemberCollection response = groupCLI.groupClient.findGroupMembers(groupID, start, size); - - Collection entries = response.getMembers(); - - MainCLI.printMessage(entries.size()+" group member(s) matched"); - - boolean first = true; - - for (GroupMemberData groupMemberData : entries) { - - if (first) { - first = false; - } else { - System.out.println(); - } - - GroupCLI.printGroupMember(groupMemberData); - } - - MainCLI.printMessage("Number of entries returned "+entries.size()); - } -} diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberAddCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberAddCLI.java new file mode 100644 index 000000000..94d1a1161 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberAddCLI.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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.group; + +import com.netscape.certsrv.group.GroupMemberData; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class GroupMemberAddCLI extends CLI { + + public GroupMemberCLI groupMemberCLI; + + public GroupMemberAddCLI(GroupMemberCLI groupMemberCLI) { + super("add", "Add group member", groupMemberCLI); + this.groupMemberCLI = groupMemberCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " ", options); + } + + public void execute(String[] args) throws Exception { + + if (args.length != 2) { + printHelp(); + System.exit(1); + } + + String groupID = args[0]; + String memberID = args[1]; + + GroupMemberData groupMemberData = groupMemberCLI.groupClient.addGroupMember(groupID, memberID); + + MainCLI.printMessage("Added group member \""+memberID+"\""); + + GroupMemberCLI.printGroupMember(groupMemberData); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberCLI.java new file mode 100644 index 000000000..22fd2354e --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberCLI.java @@ -0,0 +1,59 @@ +// --- 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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.group; + +import org.jboss.resteasy.plugins.providers.atom.Link; + +import com.netscape.certsrv.group.GroupClient; +import com.netscape.certsrv.group.GroupMemberData; +import com.netscape.cmstools.cli.CLI; + +/** + * @author Endi S. Dewata + */ +public class GroupMemberCLI extends CLI { + + public GroupClient groupClient; + + public GroupMemberCLI(CLI parent) { + super("member", "Group member management commands", parent); + + addModule(new GroupMemberFindCLI(this)); + addModule(new GroupMemberShowCLI(this)); + addModule(new GroupMemberAddCLI(this)); + addModule(new GroupMemberRemoveCLI(this)); + } + + public void execute(String[] args) throws Exception { + + client = parent.getClient(); + groupClient = (GroupClient)parent.getClient("group"); + + super.execute(args); + } + + public static void printGroupMember(GroupMemberData groupMemberData) { + System.out.println(" User: "+groupMemberData.getID()); + + Link link = groupMemberData.getLink(); + if (verbose && link != null) { + System.out.println(" Link: " + link.getHref()); + } + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java new file mode 100644 index 000000000..b9c9ac76d --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.group; + +import java.util.Collection; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; + +import com.netscape.certsrv.group.GroupMemberCollection; +import com.netscape.certsrv.group.GroupMemberData; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class GroupMemberFindCLI extends CLI { + + public GroupMemberCLI groupMemberCLI; + + public GroupMemberFindCLI(GroupMemberCLI groupMemberCLI) { + super("find", "Find group members", groupMemberCLI); + this.groupMemberCLI = groupMemberCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " [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 groupID = 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); + + GroupMemberCollection response = groupMemberCLI.groupClient.findGroupMembers(groupID, start, size); + + Collection entries = response.getMembers(); + + MainCLI.printMessage(entries.size()+" group member(s) matched"); + + boolean first = true; + + for (GroupMemberData groupMemberData : entries) { + + if (first) { + first = false; + } else { + System.out.println(); + } + + GroupMemberCLI.printGroupMember(groupMemberData); + } + + MainCLI.printMessage("Number of entries returned "+entries.size()); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java new file mode 100644 index 000000000..f340e7f64 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.group; + +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class GroupMemberRemoveCLI extends CLI { + + public GroupMemberCLI groupMemberCLI; + + public GroupMemberRemoveCLI(GroupMemberCLI groupMemberCLI) { + super("remove", "Remove group member", groupMemberCLI); + this.groupMemberCLI = groupMemberCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " ", options); + } + + public void execute(String[] args) throws Exception { + + if (args.length != 2) { + printHelp(); + System.exit(1); + } + + String groupID = args[0]; + String memberID = args[1]; + + groupMemberCLI.groupClient.removeGroupMember(groupID, memberID); + + MainCLI.printMessage("Deleted group member \""+memberID+"\""); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberShowCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberShowCLI.java new file mode 100644 index 000000000..26a096f72 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberShowCLI.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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.group; + +import com.netscape.certsrv.group.GroupMemberData; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class GroupMemberShowCLI extends CLI { + + public GroupMemberCLI groupMemberCLI; + + public GroupMemberShowCLI(GroupMemberCLI groupMemberCLI) { + super("show", "Show group member", groupMemberCLI); + this.groupMemberCLI = groupMemberCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " ", options); + } + + public void execute(String[] args) throws Exception { + + if (args.length != 2) { + printHelp(); + System.exit(1); + } + + String groupID = args[0]; + String memberID = args[1]; + + GroupMemberData groupMemberData = groupMemberCLI.groupClient.getGroupMember(groupID, memberID); + + MainCLI.printMessage("Group member \""+memberID+"\""); + + GroupMemberCLI.printGroupMember(groupMemberData); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveMemberCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveMemberCLI.java deleted file mode 100644 index ef3484045..000000000 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupRemoveMemberCLI.java +++ /dev/null @@ -1,54 +0,0 @@ -// --- 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) 2012 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- - -package com.netscape.cmstools.group; - -import com.netscape.cmstools.cli.CLI; -import com.netscape.cmstools.cli.MainCLI; - -/** - * @author Endi S. Dewata - */ -public class GroupRemoveMemberCLI extends CLI { - - public GroupCLI groupCLI; - - public GroupRemoveMemberCLI(GroupCLI groupCLI) { - super("remove-member", "Remove group member", groupCLI); - this.groupCLI = groupCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " ", options); - } - - public void execute(String[] args) throws Exception { - - if (args.length != 2) { - printHelp(); - System.exit(1); - } - - String groupID = args[0]; - String memberID = args[1]; - - groupCLI.groupClient.removeGroupMember(groupID, memberID); - - MainCLI.printMessage("Deleted group member \""+memberID+"\""); - } -} diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupShowMemberCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupShowMemberCLI.java deleted file mode 100644 index 2f50a6a08..000000000 --- a/base/java-tools/src/com/netscape/cmstools/group/GroupShowMemberCLI.java +++ /dev/null @@ -1,57 +0,0 @@ -// --- 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) 2012 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- - -package com.netscape.cmstools.group; - -import com.netscape.certsrv.group.GroupMemberData; -import com.netscape.cmstools.cli.CLI; -import com.netscape.cmstools.cli.MainCLI; - -/** - * @author Endi S. Dewata - */ -public class GroupShowMemberCLI extends CLI { - - public GroupCLI groupCLI; - - public GroupShowMemberCLI(GroupCLI groupCLI) { - super("show-member", "Show group member", groupCLI); - this.groupCLI = groupCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " ", options); - } - - public void execute(String[] args) throws Exception { - - if (args.length != 2) { - printHelp(); - System.exit(1); - } - - String groupID = args[0]; - String memberID = args[1]; - - GroupMemberData groupMemberData = groupCLI.groupClient.getGroupMember(groupID, memberID); - - MainCLI.printMessage("Group member \""+memberID+"\""); - - GroupCLI.printGroupMember(groupMemberData); - } -} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserAddCertCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserAddCertCLI.java deleted file mode 100644 index e3271c022..000000000 --- a/base/java-tools/src/com/netscape/cmstools/user/UserAddCertCLI.java +++ /dev/null @@ -1,97 +0,0 @@ -// --- 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) 2012 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- - -package com.netscape.cmstools.user; - -import java.io.File; -import java.util.Scanner; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; - -import com.netscape.certsrv.user.UserCertData; -import com.netscape.cmstools.cli.CLI; -import com.netscape.cmstools.cli.MainCLI; - -/** - * @author Endi S. Dewata - */ -public class UserAddCertCLI extends CLI { - - public UserCLI userCLI; - - public UserAddCertCLI(UserCLI userCLI) { - super("add-cert", "Add user cert", userCLI); - this.userCLI = userCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " [OPTIONS...]", options); - } - - public void execute(String[] args) throws Exception { - - Option option = new Option(null, "input", true, "Input file"); - option.setArgName("file"); - option.setRequired(true); - 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 file = cmd.getOptionValue("input"); - - // get cert from file - if (verbose) { - System.out.println("Reading cert from "+file+"."); - } - String encoded = new Scanner(new File(file)).useDelimiter("\\A").next(); - if (verbose) { - System.out.println(encoded); - } - - UserCertData userCertData = new UserCertData(); - userCertData.setEncoded(encoded); - - if (verbose) { - System.out.println(userCertData); - } - - userCertData = userCLI.userClient.addUserCert(userId, userCertData); - - MainCLI.printMessage("Added certificate \"" + userCertData.getID() + "\""); - - UserCLI.printCert(userCertData, false, false); - } -} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserAddMembershipCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserAddMembershipCLI.java deleted file mode 100644 index ab8e61fe1..000000000 --- a/base/java-tools/src/com/netscape/cmstools/user/UserAddMembershipCLI.java +++ /dev/null @@ -1,57 +0,0 @@ -// --- 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 userCLI; - - public UserAddMembershipCLI(UserCLI userCLI) { - super("add-membership", "Add user membership", userCLI); - this.userCLI = userCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " ", 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 = userCLI.userClient.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 edbb62cab..7a03d3384 100644 --- a/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java @@ -21,10 +21,8 @@ package com.netscape.cmstools.user; import org.apache.commons.lang.StringUtils; 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.certsrv.user.UserResource; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -45,14 +43,9 @@ public class UserCLI extends CLI { addModule(new UserModifyCLI(this)); addModule(new UserRemoveCLI(this)); - addModule(new UserFindCertCLI(this)); - addModule(new UserShowCertCLI(this)); - addModule(new UserAddCertCLI(this)); - addModule(new UserRemoveCertCLI(this)); + addModule(new UserCertCLI(this)); - addModule(new UserFindMembershipCLI(this)); - addModule(new UserAddMembershipCLI(this)); - addModule(new UserRemoveMembershipCLI(this)); + addModule(new UserMembershipCLI(this)); } public String getFullName() { @@ -118,42 +111,4 @@ public class UserCLI extends CLI { } } } - - public static void printCert( - UserCertData userCertData, - boolean showPrettyPrint, - boolean showEncoded) { - - System.out.println(" Cert ID: " + userCertData.getID()); - System.out.println(" Version: " + userCertData.getVersion()); - System.out.println(" Serial Number: " + userCertData.getSerialNumber().toHexString()); - System.out.println(" Issuer: " + userCertData.getIssuerDN()); - System.out.println(" Subject: " + userCertData.getSubjectDN()); - - Link link = userCertData.getLink(); - if (verbose && link != null) { - System.out.println(" Link: " + link.getHref()); - } - - String prettyPrint = userCertData.getPrettyPrint(); - if (showPrettyPrint && prettyPrint != null) { - System.out.println(); - System.out.println(prettyPrint); - } - - String encoded = userCertData.getEncoded(); - if (showEncoded && encoded != null) { - System.out.println(); - 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/UserCertAddCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertAddCLI.java new file mode 100644 index 000000000..1a1ce5ee0 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertAddCLI.java @@ -0,0 +1,97 @@ +// --- 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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.user; + +import java.io.File; +import java.util.Scanner; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; + +import com.netscape.certsrv.user.UserCertData; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class UserCertAddCLI extends CLI { + + public UserCertCLI userCertCLI; + + public UserCertAddCLI(UserCertCLI userCertCLI) { + super("add", "Add user certificate", userCertCLI); + this.userCertCLI = userCertCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " [OPTIONS...]", options); + } + + public void execute(String[] args) throws Exception { + + Option option = new Option(null, "input", true, "Input file"); + option.setArgName("file"); + option.setRequired(true); + 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 file = cmd.getOptionValue("input"); + + // get cert from file + if (verbose) { + System.out.println("Reading cert from "+file+"."); + } + String encoded = new Scanner(new File(file)).useDelimiter("\\A").next(); + if (verbose) { + System.out.println(encoded); + } + + UserCertData userCertData = new UserCertData(); + userCertData.setEncoded(encoded); + + if (verbose) { + System.out.println(userCertData); + } + + userCertData = userCertCLI.userClient.addUserCert(userId, userCertData); + + MainCLI.printMessage("Added certificate \"" + userCertData.getID() + "\""); + + UserCertCLI.printCert(userCertData, false, false); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCertCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertCLI.java new file mode 100644 index 000000000..163c55f25 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertCLI.java @@ -0,0 +1,79 @@ +// --- 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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.user; + +import org.jboss.resteasy.plugins.providers.atom.Link; + +import com.netscape.certsrv.user.UserCertData; +import com.netscape.certsrv.user.UserClient; +import com.netscape.cmstools.cli.CLI; + +/** + * @author Endi S. Dewata + */ +public class UserCertCLI extends CLI { + + public UserClient userClient; + + public UserCertCLI(UserCLI parent) { + super("cert", "User certificate management commands", parent); + + addModule(new UserCertFindCLI(this)); + addModule(new UserCertShowCLI(this)); + addModule(new UserCertAddCLI(this)); + addModule(new UserCertRemoveCLI(this)); + } + + public void execute(String[] args) throws Exception { + + client = parent.getClient(); + userClient = (UserClient)parent.getClient("user"); + + super.execute(args); + } + + public static void printCert( + UserCertData userCertData, + boolean showPrettyPrint, + boolean showEncoded) { + + System.out.println(" Cert ID: " + userCertData.getID()); + System.out.println(" Version: " + userCertData.getVersion()); + System.out.println(" Serial Number: " + userCertData.getSerialNumber().toHexString()); + System.out.println(" Issuer: " + userCertData.getIssuerDN()); + System.out.println(" Subject: " + userCertData.getSubjectDN()); + + Link link = userCertData.getLink(); + if (verbose && link != null) { + System.out.println(" Link: " + link.getHref()); + } + + String prettyPrint = userCertData.getPrettyPrint(); + if (showPrettyPrint && prettyPrint != null) { + System.out.println(); + System.out.println(prettyPrint); + } + + String encoded = userCertData.getEncoded(); + if (showEncoded && encoded != null) { + System.out.println(); + System.out.println(encoded); + } + } +} \ No newline at end of file diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java new file mode 100644 index 000000000..680b6b362 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.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) 2012 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.UserCertCollection; +import com.netscape.certsrv.user.UserCertData; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class UserCertFindCLI extends CLI { + + public UserCertCLI userCertCLI; + + public UserCertFindCLI(UserCertCLI userCertCLI) { + super("find", "Find user certificates", userCertCLI); + this.userCertCLI = userCertCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " [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); + + UserCertCollection response = userCertCLI.userClient.findUserCerts(userID, start, size); + + Collection entries = response.getCerts(); + + MainCLI.printMessage(entries.size() + " user cert(s) matched"); + + boolean first = true; + + for (UserCertData userCertData : entries) { + + if (first) { + first = false; + } else { + System.out.println(); + } + + UserCertCLI.printCert(userCertData, false, false); + } + + MainCLI.printMessage("Number of entries returned " + entries.size()); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java new file mode 100644 index 000000000..c68988fee --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java @@ -0,0 +1,61 @@ +// --- 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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.user; + +import java.net.URLEncoder; + +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + + +/** + * @author Endi S. Dewata + */ +public class UserCertRemoveCLI extends CLI { + + public UserCertCLI userCertCLI; + + public UserCertRemoveCLI(UserCertCLI userCertCLI) { + super("remove", "Remove user certificate", userCertCLI); + this.userCertCLI = userCertCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " ", options); + } + + public void execute(String[] args) throws Exception { + + if (args.length != 2) { + printHelp(); + System.exit(1); + } + + String userID = args[0]; + String certID = args[1]; + + if (verbose) { + System.out.println("Removing cert "+certID+" from user "+userID+"."); + } + + userCertCLI.userClient.removeUserCert(userID, URLEncoder.encode(certID, "UTF-8")); + + MainCLI.printMessage("Deleted certificate \"" + certID + "\""); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCertShowCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertShowCLI.java new file mode 100644 index 000000000..e07de6d3e --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertShowCLI.java @@ -0,0 +1,96 @@ +// --- 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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.user; + +import java.io.FileWriter; +import java.io.PrintWriter; +import java.net.URLEncoder; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; + +import com.netscape.certsrv.user.UserCertData; +import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; + +/** + * @author Endi S. Dewata + */ +public class UserCertShowCLI extends CLI { + + public UserCertCLI userCertCLI; + + public UserCertShowCLI(UserCertCLI userCertCLI) { + super("show", "Show user certificate", userCertCLI); + this.userCertCLI = userCertCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " [OPTIONS...]", options); + } + + public void execute(String[] args) throws Exception { + + Option option = new Option(null, "output", true, "Output file"); + option.setArgName("file"); + options.addOption(option); + + options.addOption(null, "pretty", false, "Pretty print"); + options.addOption(null, "encoded", false, "Base-64 encoded"); + + CommandLine cmd = null; + + try { + cmd = parser.parse(options, args); + + } catch (Exception e) { + System.err.println("Error: " + e.getMessage()); + printHelp(); + System.exit(1); + } + + boolean showPrettyPrint = cmd.hasOption("pretty"); + boolean showEncoded = cmd.hasOption("encoded"); + + String[] cmdArgs = cmd.getArgs(); + + if (cmdArgs.length != 2) { + printHelp(); + System.exit(1); + } + + String userID = cmdArgs[0]; + String certID = cmdArgs[1]; + String file = cmd.getOptionValue("output"); + + UserCertData userCertData = userCertCLI.userClient.getUserCert(userID, URLEncoder.encode(certID, "UTF-8")); + + String encoded = userCertData.getEncoded(); + if (encoded != null && file != null) { + // store cert to file + PrintWriter out = new PrintWriter(new FileWriter(file)); + out.print(encoded); + out.close(); + } + + MainCLI.printMessage("Certificate \"" + userCertData.getID() + "\""); + + UserCertCLI.printCert(userCertData, showPrettyPrint, showEncoded); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserFindCertCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserFindCertCLI.java deleted file mode 100644 index 15bc4f753..000000000 --- a/base/java-tools/src/com/netscape/cmstools/user/UserFindCertCLI.java +++ /dev/null @@ -1,104 +0,0 @@ -// --- 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) 2012 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.UserCertCollection; -import com.netscape.certsrv.user.UserCertData; -import com.netscape.cmstools.cli.CLI; -import com.netscape.cmstools.cli.MainCLI; - -/** - * @author Endi S. Dewata - */ -public class UserFindCertCLI extends CLI { - - public UserCLI userCLI; - - public UserFindCertCLI(UserCLI userCLI) { - super("find-cert", "Find user certs", userCLI); - this.userCLI = userCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " [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); - - UserCertCollection response = userCLI.userClient.findUserCerts(userID, start, size); - - Collection entries = response.getCerts(); - - MainCLI.printMessage(entries.size() + " user cert(s) matched"); - - boolean first = true; - - for (UserCertData userCertData : entries) { - - if (first) { - first = false; - } else { - System.out.println(); - } - - UserCLI.printCert(userCertData, false, false); - } - - MainCLI.printMessage("Number of entries returned " + entries.size()); - } -} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserFindMembershipCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserFindMembershipCLI.java deleted file mode 100644 index 0c41635dd..000000000 --- a/base/java-tools/src/com/netscape/cmstools/user/UserFindMembershipCLI.java +++ /dev/null @@ -1,104 +0,0 @@ -// --- 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 userCLI; - - public UserFindMembershipCLI(UserCLI userCLI) { - super("find-membership", "Find user memberships", userCLI); - this.userCLI = userCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " [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 = userCLI.userClient.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/UserMembershipAddCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipAddCLI.java new file mode 100644 index 000000000..1b9925c3b --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipAddCLI.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 UserMembershipAddCLI extends CLI { + + public UserMembershipCLI userMembershipCLI; + + public UserMembershipAddCLI(UserMembershipCLI userMembershipCLI) { + super("add", "Add user membership", userMembershipCLI); + this.userMembershipCLI = userMembershipCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " ", 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 = userMembershipCLI.userClient.addUserMembership(userID, groupID); + + MainCLI.printMessage("Added membership in \""+groupID+"\""); + + UserMembershipCLI.printUserMembership(userMembershipData); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserMembershipCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipCLI.java new file mode 100644 index 000000000..430aef5ad --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipCLI.java @@ -0,0 +1,58 @@ +// --- 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) 2012 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.cmstools.user; + +import org.jboss.resteasy.plugins.providers.atom.Link; + +import com.netscape.certsrv.user.UserClient; +import com.netscape.certsrv.user.UserMembershipData; +import com.netscape.cmstools.cli.CLI; + +/** + * @author Endi S. Dewata + */ +public class UserMembershipCLI extends CLI { + + public UserClient userClient; + + public UserMembershipCLI(CLI parent) { + super("membership", "User membership management commands", parent); + + addModule(new UserMembershipFindCLI(this)); + addModule(new UserMembershipAddCLI(this)); + addModule(new UserMembershipRemoveCLI(this)); + } + + public void execute(String[] args) throws Exception { + + client = parent.getClient(); + userClient = (UserClient)parent.getClient("user"); + + super.execute(args); + } + + 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/UserMembershipFindCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java new file mode 100644 index 000000000..129aa6dc8 --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.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 UserMembershipFindCLI extends CLI { + + public UserMembershipCLI userMembershipCLI; + + public UserMembershipFindCLI(UserMembershipCLI userMembershipCLI) { + super("find", "Find user memberships", userMembershipCLI); + this.userMembershipCLI = userMembershipCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " [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 = userMembershipCLI.userClient.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(); + } + + UserMembershipCLI.printUserMembership(userMembershipData); + } + + MainCLI.printMessage("Number of entries returned "+entries.size()); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserMembershipRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipRemoveCLI.java new file mode 100644 index 000000000..bb0ca714b --- /dev/null +++ b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipRemoveCLI.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 UserMembershipRemoveCLI extends CLI { + + public UserMembershipCLI userMembershipCLI; + + public UserMembershipRemoveCLI(UserMembershipCLI userMembershipCLI) { + super("remove", "Remove user membership", userMembershipCLI); + this.userMembershipCLI = userMembershipCLI; + } + + public void printHelp() { + formatter.printHelp(getFullName() + " ", options); + } + + public void execute(String[] args) throws Exception { + + if (args.length != 2) { + printHelp(); + System.exit(1); + } + + String userID = args[0]; + String groupID = args[1]; + + userMembershipCLI.userClient.removeUserMembership(userID, groupID); + + MainCLI.printMessage("Deleted membership in group \""+groupID+"\""); + } +} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserRemoveCertCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserRemoveCertCLI.java deleted file mode 100644 index 5758c4ccd..000000000 --- a/base/java-tools/src/com/netscape/cmstools/user/UserRemoveCertCLI.java +++ /dev/null @@ -1,61 +0,0 @@ -// --- 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) 2012 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- - -package com.netscape.cmstools.user; - -import java.net.URLEncoder; - -import com.netscape.cmstools.cli.CLI; -import com.netscape.cmstools.cli.MainCLI; - - -/** - * @author Endi S. Dewata - */ -public class UserRemoveCertCLI extends CLI { - - public UserCLI userCLI; - - public UserRemoveCertCLI(UserCLI userCLI) { - super("remove-cert", "Remove user cert", userCLI); - this.userCLI = userCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " ", options); - } - - public void execute(String[] args) throws Exception { - - if (args.length != 2) { - printHelp(); - System.exit(1); - } - - String userID = args[0]; - String certID = args[1]; - - if (verbose) { - System.out.println("Removing cert "+certID+" from user "+userID+"."); - } - - userCLI.userClient.removeUserCert(userID, URLEncoder.encode(certID, "UTF-8")); - - MainCLI.printMessage("Deleted certificate \"" + certID + "\""); - } -} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserRemoveMembershipCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserRemoveMembershipCLI.java deleted file mode 100644 index 62091efb0..000000000 --- a/base/java-tools/src/com/netscape/cmstools/user/UserRemoveMembershipCLI.java +++ /dev/null @@ -1,54 +0,0 @@ -// --- 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 userCLI; - - public UserRemoveMembershipCLI(UserCLI userCLI) { - super("remove-membership", "Remove user membership", userCLI); - this.userCLI = userCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " ", options); - } - - public void execute(String[] args) throws Exception { - - if (args.length != 2) { - printHelp(); - System.exit(1); - } - - String userID = args[0]; - String groupID = args[1]; - - userCLI.userClient.removeUserMembership(userID, groupID); - - MainCLI.printMessage("Deleted membership in group \""+groupID+"\""); - } -} diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserShowCertCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserShowCertCLI.java deleted file mode 100644 index 87e535f6a..000000000 --- a/base/java-tools/src/com/netscape/cmstools/user/UserShowCertCLI.java +++ /dev/null @@ -1,96 +0,0 @@ -// --- 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) 2012 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- - -package com.netscape.cmstools.user; - -import java.io.FileWriter; -import java.io.PrintWriter; -import java.net.URLEncoder; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; - -import com.netscape.certsrv.user.UserCertData; -import com.netscape.cmstools.cli.CLI; -import com.netscape.cmstools.cli.MainCLI; - -/** - * @author Endi S. Dewata - */ -public class UserShowCertCLI extends CLI { - - public UserCLI userCLI; - - public UserShowCertCLI(UserCLI userCLI) { - super("show-cert", "Show user cert", userCLI); - this.userCLI = userCLI; - } - - public void printHelp() { - formatter.printHelp(getFullName() + " [OPTIONS...]", options); - } - - public void execute(String[] args) throws Exception { - - Option option = new Option(null, "output", true, "Output file"); - option.setArgName("file"); - options.addOption(option); - - options.addOption(null, "pretty", false, "Pretty print"); - options.addOption(null, "encoded", false, "Base-64 encoded"); - - CommandLine cmd = null; - - try { - cmd = parser.parse(options, args); - - } catch (Exception e) { - System.err.println("Error: " + e.getMessage()); - printHelp(); - System.exit(1); - } - - boolean showPrettyPrint = cmd.hasOption("pretty"); - boolean showEncoded = cmd.hasOption("encoded"); - - String[] cmdArgs = cmd.getArgs(); - - if (cmdArgs.length != 2) { - printHelp(); - System.exit(1); - } - - String userID = cmdArgs[0]; - String certID = cmdArgs[1]; - String file = cmd.getOptionValue("output"); - - UserCertData userCertData = userCLI.userClient.getUserCert(userID, URLEncoder.encode(certID, "UTF-8")); - - String encoded = userCertData.getEncoded(); - if (encoded != null && file != null) { - // store cert to file - PrintWriter out = new PrintWriter(new FileWriter(file)); - out.print(encoded); - out.close(); - } - - MainCLI.printMessage("Certificate \"" + userCertData.getID() + "\""); - - UserCLI.printCert(userCertData, showPrettyPrint, showEncoded); - } -} -- cgit