diff --git a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java index 22a1ff60..51930ad7 100644 --- a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java +++ b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java @@ -578,6 +578,33 @@ public void handleEvent(SkypeChatMessageEvent event) { public void handleEvent(SuccessfulAuthEvent event) { } + public void handleEvent(AuthMethodNotAllowedEvent event) { + } + + public void handleEvent(FailedACLEvent event) { + } + + public void handleEvent(InvalidTransportEvent event) { + } + + public void handleEvent(LoadAverageLimitEvent event) { + } + + public void handleEvent(MemoryLimitEvent event) { + } + + public void handleEvent(RequestNotAllowedEvent event) { + } + + public void handleEvent(RequestNotSupportedEvent event) { + } + + public void handleEvent(SessionLimitEvent event) { + } + + public void handleEvent(UnexpectedAddressEvent event) { + } + public void handleEvent(TransferEvent event) { } diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractSecurityEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractSecurityEvent.java new file mode 100644 index 00000000..c08a8329 --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/AbstractSecurityEvent.java @@ -0,0 +1,98 @@ +package org.asteriskjava.manager.event; + +public abstract class AbstractSecurityEvent extends ManagerEvent { + private String eventTv; + private String severity; + private String service; + private Integer eventVersion; + private String accountId; + private String sessionId; + private String localAddress; + private String remoteAddress; + private String module; + private String sessionTv; + + protected AbstractSecurityEvent(Object source) { + super(source); + } + + public String getAccountId() { + return accountId; + } + + public void setAccountId(String accountId) { + this.accountId = accountId; + } + + public String getEventTv() { + return eventTv; + } + + public void setEventTv(String eventTimestamp) { + this.eventTv = eventTimestamp; + } + + public Integer getEventVersion() { + return eventVersion; + } + + public void setEventVersion(Integer eventVersion) { + this.eventVersion = eventVersion; + } + + public String getLocalAddress() { + return localAddress; + } + + public void setLocalAddress(String localAddress) { + this.localAddress = localAddress; + } + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } + + public String getRemoteAddress() { + return remoteAddress; + } + + public void setRemoteAddress(String remoteAddress) { + this.remoteAddress = remoteAddress; + } + + public String getService() { + return service; + } + + public void setService(String service) { + this.service = service; + } + + public String getSessionId() { + return sessionId; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public String getSessionTv() { + return sessionTv; + } + + public void setSessionTv(String sessionTimestamp) { + this.sessionTv = sessionTimestamp; + } + + public String getSeverity() { + return severity; + } + + public void setSeverity(String severity) { + this.severity = severity; + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/AuthMethodNotAllowedEvent.java b/src/main/java/org/asteriskjava/manager/event/AuthMethodNotAllowedEvent.java new file mode 100644 index 00000000..6eaa3356 --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/AuthMethodNotAllowedEvent.java @@ -0,0 +1,17 @@ +package org.asteriskjava.manager.event; + +public final class AuthMethodNotAllowedEvent extends AbstractSecurityEvent { + private String authMethod; + + public AuthMethodNotAllowedEvent(Object source) { + super(source); + } + + public String getAuthMethod() { + return authMethod; + } + + public void setAuthMethod(String value) { + this.authMethod = value; + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java b/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java index 3c88d838..877facde 100644 --- a/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java @@ -10,13 +10,20 @@ public class ChallengeResponseFailedEvent extends ManagerEvent { /** * Serializable version identifier. */ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -4630209124005390153L; private String severity; private String eventversion; private String service; private String remoteaddress; private String localaddress; + private String accountId; + private String module; + private String sessiontv; + private String sessionId; + private String challange; + private String response; + private String expectedResponse; /** * @param source @@ -77,4 +84,60 @@ public void setEventtv(String eventv) { this.setTimestamp(t.doubleValue()); } } + + public String getAccountId() { + return accountId; + } + + public void setAccountId(String accountId) { + this.accountId = accountId; + } + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } + + public String getSessiontv() { + return sessiontv; + } + + public void setSessiontv(String sessiontv) { + this.sessiontv = sessiontv; + } + + public String getSessionId() { + return sessionId; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public String getChallange() { + return challange; + } + + public void setChallange(String challange) { + this.challange = challange; + } + + public String getResponse() { + return response; + } + + public void setResponse(String response) { + this.response = response; + } + + public String getExpectedResponse() { + return expectedResponse; + } + + public void setExpectedResponse(String expectedResponse) { + this.expectedResponse = expectedResponse; + } } diff --git a/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java b/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java index c924266e..a4e9256a 100644 --- a/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java @@ -7,7 +7,7 @@ public class ChallengeSentEvent extends ManagerEvent { /** * */ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 8219597230372769610L; private String severity; private Integer eventVersion; private String accountId; @@ -17,6 +17,8 @@ public class ChallengeSentEvent extends ManagerEvent { private String localAddress; private String challenge; private String sessionId; + private String module; + private String sessiontv; public ChallengeSentEvent(Object source) { super(source); @@ -93,4 +95,20 @@ public String getSessionId() { public void setSessionId(String sessionId) { this.sessionId = sessionId; } + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } + + public String getSessiontv() { + return sessiontv; + } + + public void setSessiontv(String sessiontv) { + this.sessiontv = sessiontv; + } } diff --git a/src/main/java/org/asteriskjava/manager/event/FailedACLEvent.java b/src/main/java/org/asteriskjava/manager/event/FailedACLEvent.java new file mode 100644 index 00000000..8b7d1947 --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/FailedACLEvent.java @@ -0,0 +1,17 @@ +package org.asteriskjava.manager.event; + +public final class FailedACLEvent extends AbstractSecurityEvent { + private String aclName; + + public FailedACLEvent(Object source) { + super(source); + } + + public String getAclName() { + return this.aclName; + } + + public void setAclName(String aclName) { + this.aclName = aclName; + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java b/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java index be7bbe4c..24db59dc 100644 --- a/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java +++ b/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java @@ -9,7 +9,7 @@ public class InvalidAccountId extends ManagerEvent { /** * */ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 7812041063040911614L; private String severity; private Integer eventVersion; private String eventtv; @@ -19,6 +19,8 @@ public class InvalidAccountId extends ManagerEvent { private String service; private String remoteAddress; private String event; + private String module; + private String sessiontv; public InvalidAccountId(Object source) { super(source); @@ -99,4 +101,20 @@ public String getEvent() { public void setEvent(String event) { this.event = event; } + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } + + public String getSessiontv() { + return sessiontv; + } + + public void setSessiontv(String sessiontv) { + this.sessiontv = sessiontv; + } } diff --git a/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java b/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java index c0a9090a..866dc725 100644 --- a/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java @@ -7,7 +7,7 @@ public class InvalidPasswordEvent extends ManagerEvent { /** * */ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -5161586187203331724L; private String severity; private Integer eventVersion; private String eventtv; @@ -19,6 +19,10 @@ public class InvalidPasswordEvent extends ManagerEvent { private String service; private String remoteAddress; private String challenge; + private String sessiontv; + private String localAddress; + private String sessionId; + private String module; public InvalidPasswordEvent(Object source) { super(source); @@ -111,4 +115,36 @@ public String getChallenge() { public void setChallenge(String challenge) { this.challenge = challenge; } + + public String getLocalAddress() { + return localAddress; + } + + public void setLocalAddress(String localAddress) { + this.localAddress = localAddress; + } + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } + + public String getSessionId() { + return sessionId; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public String getSessiontv() { + return sessiontv; + } + + public void setSessiontv(String sessiontv) { + this.sessiontv = sessiontv; + } } diff --git a/src/main/java/org/asteriskjava/manager/event/InvalidTransportEvent.java b/src/main/java/org/asteriskjava/manager/event/InvalidTransportEvent.java new file mode 100644 index 00000000..6a2e1c5d --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/InvalidTransportEvent.java @@ -0,0 +1,17 @@ +package org.asteriskjava.manager.event; + +public final class InvalidTransportEvent extends AbstractSecurityEvent { + private String attemptedTransport; + + public InvalidTransportEvent(Object source) { + super(source); + } + + public String getAttemptedTransport() { + return attemptedTransport; + } + + public void setAttemptedTransport(String value) { + this.attemptedTransport = value; + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/LoadAverageLimitEvent.java b/src/main/java/org/asteriskjava/manager/event/LoadAverageLimitEvent.java new file mode 100644 index 00000000..71aa38e2 --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/LoadAverageLimitEvent.java @@ -0,0 +1,7 @@ +package org.asteriskjava.manager.event; + +public final class LoadAverageLimitEvent extends AbstractSecurityEvent { + public LoadAverageLimitEvent(Object source) { + super(source); + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/MemoryLimitEvent.java b/src/main/java/org/asteriskjava/manager/event/MemoryLimitEvent.java new file mode 100644 index 00000000..6b086fbe --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/MemoryLimitEvent.java @@ -0,0 +1,7 @@ +package org.asteriskjava.manager.event; + +public final class MemoryLimitEvent extends AbstractSecurityEvent { + public MemoryLimitEvent(Object source) { + super(source); + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java b/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java index cd2f96ce..6895fbf4 100644 --- a/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java @@ -9,7 +9,7 @@ public class RequestBadFormatEvent extends ManagerEvent { /** * Serializable version identifier. */ - private final static long serialVersionUID = 12534663L; + private final static long serialVersionUID = -4626589852577838795L; private String severity; @@ -31,6 +31,10 @@ public class RequestBadFormatEvent extends ManagerEvent { private String remoteaddress; + private String module; + + private String requestparams; + public RequestBadFormatEvent(Object source) { super(source); } @@ -114,4 +118,20 @@ public String getRemoteaddress() { public void setRemoteaddress(String remoteaddress) { this.remoteaddress = remoteaddress; } + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } + + public String getRequestparams() { + return requestparams; + } + + public void setRequestparams(String requestparams) { + this.requestparams = requestparams; + } } diff --git a/src/main/java/org/asteriskjava/manager/event/RequestNotAllowedEvent.java b/src/main/java/org/asteriskjava/manager/event/RequestNotAllowedEvent.java new file mode 100644 index 00000000..5aa32367 --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/RequestNotAllowedEvent.java @@ -0,0 +1,26 @@ +package org.asteriskjava.manager.event; + +public final class RequestNotAllowedEvent extends AbstractSecurityEvent { + private String requestParams; + private String requestType; + + public RequestNotAllowedEvent(Object source) { + super(source); + } + + public Object getRequestParams() { + return requestParams; + } + + public void setRequestParams(String value) { + this.requestParams = value; + } + + public Object getRequestType() { + return requestType; + } + + public void setRequestType(String value) { + this.requestType = value; + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/RequestNotSupportedEvent.java b/src/main/java/org/asteriskjava/manager/event/RequestNotSupportedEvent.java new file mode 100644 index 00000000..e84aa624 --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/RequestNotSupportedEvent.java @@ -0,0 +1,17 @@ +package org.asteriskjava.manager.event; + +public final class RequestNotSupportedEvent extends AbstractSecurityEvent { + private String requestType; + + public RequestNotSupportedEvent(Object source) { + super(source); + } + + public String getRequestType() { + return requestType; + } + + public void setRequestType(String value) { + this.requestType = value; + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/SessionLimitEvent.java b/src/main/java/org/asteriskjava/manager/event/SessionLimitEvent.java new file mode 100644 index 00000000..f6debbfe --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/SessionLimitEvent.java @@ -0,0 +1,7 @@ +package org.asteriskjava.manager.event; + +public final class SessionLimitEvent extends AbstractSecurityEvent { + public SessionLimitEvent(Object source) { + super(source); + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java b/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java index e8b533dd..33a4ed51 100644 --- a/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java @@ -7,7 +7,7 @@ public class SuccessfulAuthEvent extends ManagerEvent { /** * */ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -1075176582208556468L; private String severity; private Integer eventVersion; private String accountId; @@ -18,6 +18,7 @@ public class SuccessfulAuthEvent extends ManagerEvent { private String remoteAddress; private String localAddress; private String sessionId; + private String module; public SuccessfulAuthEvent(Object source) { super(source); @@ -102,4 +103,12 @@ public String getSessionId() { public void setSessionId(String sessionId) { this.sessionId = sessionId; } + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } } diff --git a/src/main/java/org/asteriskjava/manager/event/UnexpectedAddressEvent.java b/src/main/java/org/asteriskjava/manager/event/UnexpectedAddressEvent.java new file mode 100644 index 00000000..7229bb2d --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/UnexpectedAddressEvent.java @@ -0,0 +1,17 @@ +package org.asteriskjava.manager.event; + +public final class UnexpectedAddressEvent extends AbstractSecurityEvent { + private String expectedAddress; + + public UnexpectedAddressEvent(Object source) { + super(source); + } + + public String getExpectedAddress() { + return expectedAddress; + } + + public void setExpectedAddress(String value) { + this.expectedAddress = value; + } +}