diff options
author | Endi S. Dewata <edewata@redhat.com> | 2013-08-22 17:48:58 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2013-08-24 01:39:04 -0400 |
commit | ffb49f1552a9eabb8ec083edd91841253e173ae5 (patch) | |
tree | f4c47644c8c5f7f8d9132656599b18c3130d51cf /base/common/src/com/netscape/certsrv/logging | |
parent | c587da42da2b87dec2d1fbfd262a1fc6e8598452 (diff) | |
download | pki-ffb49f1552a9eabb8ec083edd91841253e173ae5.tar.gz pki-ffb49f1552a9eabb8ec083edd91841253e173ae5.tar.xz pki-ffb49f1552a9eabb8ec083edd91841253e173ae5.zip |
Added TPS activities resource.
New REST services and clients have been added for TPS activities.
The activity database is currently implemented as in-memory database
with some sample data. Later it will be converted into LDAP database.
Ticket #652
Diffstat (limited to 'base/common/src/com/netscape/certsrv/logging')
4 files changed, 342 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/certsrv/logging/ActivityClient.java b/base/common/src/com/netscape/certsrv/logging/ActivityClient.java new file mode 100644 index 000000000..251183ec5 --- /dev/null +++ b/base/common/src/com/netscape/certsrv/logging/ActivityClient.java @@ -0,0 +1,52 @@ +//--- 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.certsrv.logging; + +import java.net.URISyntaxException; + +import com.netscape.certsrv.client.Client; +import com.netscape.certsrv.client.PKIClient; + +/** + * @author Endi S. Dewata + */ +public class ActivityClient extends Client { + + public ActivityResource resource; + + public ActivityClient(PKIClient client) throws URISyntaxException { + this(client, client.getSubsystem()); + } + + public ActivityClient(PKIClient client, String subsystem) throws URISyntaxException { + super(client, subsystem, "activity"); + init(); + } + + public void init() throws URISyntaxException { + resource = createProxy(ActivityResource.class); + } + + public ActivityCollection findActivities(Integer start, Integer size) { + return resource.findActivities(start, size); + } + + public ActivityData getActivity(String tokenID) { + return resource.getActivity(tokenID); + } +} diff --git a/base/common/src/com/netscape/certsrv/logging/ActivityCollection.java b/base/common/src/com/netscape/certsrv/logging/ActivityCollection.java new file mode 100644 index 000000000..d6f998843 --- /dev/null +++ b/base/common/src/com/netscape/certsrv/logging/ActivityCollection.java @@ -0,0 +1,38 @@ +// --- 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.certsrv.logging; + +import java.util.Collection; + +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlRootElement; + +import com.netscape.certsrv.base.DataCollection; + +/** + * @author Endi S. Dewata + */ +@XmlRootElement(name="Activities") +public class ActivityCollection extends DataCollection<ActivityData> { + + @XmlElementRef + public Collection<ActivityData> getEntries() { + return super.getEntries(); + } +} diff --git a/base/common/src/com/netscape/certsrv/logging/ActivityData.java b/base/common/src/com/netscape/certsrv/logging/ActivityData.java new file mode 100644 index 000000000..0624cc73b --- /dev/null +++ b/base/common/src/com/netscape/certsrv/logging/ActivityData.java @@ -0,0 +1,208 @@ +// --- 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.certsrv.logging; + +import java.io.StringReader; +import java.io.StringWriter; +import java.util.Date; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import org.jboss.resteasy.plugins.providers.atom.Link; + +/** + * @author Endi S. Dewata + */ +@XmlRootElement(name="Activity") +public class ActivityData { + + public static Marshaller marshaller; + public static Unmarshaller unmarshaller; + + static { + try { + marshaller = JAXBContext.newInstance(ActivityData.class).createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); + unmarshaller = JAXBContext.newInstance(ActivityData.class).createUnmarshaller(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + String id; + String tokenID; + String userID; + String ip; + String operation; + String result; + Date date; + + Link link; + + @XmlAttribute(name="id") + public String getID() { + return id; + } + + public void setID(String id) { + this.id = id; + } + + @XmlElement(name="TokenID") + public String getTokenID() { + return tokenID; + } + + public void setTokenID(String tokenID) { + this.tokenID = tokenID; + } + + @XmlElement(name="UserID") + public String getUserID() { + return userID; + } + + public void setUserID(String userID) { + this.userID = userID; + } + + @XmlElement(name="IP") + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } + + @XmlElement(name="Operation") + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } + + @XmlElement(name="Result") + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + @XmlElement(name="Date") + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + @XmlElement(name="Link") + public Link getLink() { + return link; + } + + public void setLink(Link link) { + this.link = link; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((link == null) ? 0 : link.hashCode()); + result = prime * result + ((userID == null) ? 0 : userID.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ActivityData other = (ActivityData) obj; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (link == null) { + if (other.link != null) + return false; + } else if (!link.equals(other.link)) + return false; + if (userID == null) { + if (other.userID != null) + return false; + } else if (!userID.equals(other.userID)) + return false; + return true; + } + + public String toString() { + try { + StringWriter sw = new StringWriter(); + marshaller.marshal(this, sw); + return sw.toString(); + + } catch (Exception e) { + return super.toString(); + } + } + + public static ActivityData valueOf(String string) throws Exception { + try { + return (ActivityData)unmarshaller.unmarshal(new StringReader(string)); + } catch (Exception e) { + return null; + } + } + + public static void main(String args[]) throws Exception { + + ActivityData before = new ActivityData(); + before.setID("activity1"); + before.setTokenID("TOKEN1234"); + before.setUserID("user1"); + before.setIp("192.168.1.1"); + before.setOperation("enroll"); + before.setResult("success"); + before.setDate(new Date()); + + String string = before.toString(); + System.out.println(string); + + ActivityData after = ActivityData.valueOf(string); + System.out.println(before.equals(after)); + } +} diff --git a/base/common/src/com/netscape/certsrv/logging/ActivityResource.java b/base/common/src/com/netscape/certsrv/logging/ActivityResource.java new file mode 100644 index 000000000..6ecf41dd2 --- /dev/null +++ b/base/common/src/com/netscape/certsrv/logging/ActivityResource.java @@ -0,0 +1,44 @@ +// --- 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.certsrv.logging; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + + +/** + * @author Endi S. Dewata + */ +@Path("activities") +public interface ActivityResource { + + @GET + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) + public ActivityCollection findActivities( + @QueryParam("start") Integer start, + @QueryParam("size") Integer size); + + @GET + @Path("{activityID}") + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) + public ActivityData getActivity(@PathParam("activityID") String activityID); +} |