[svn-commits] russell: branch group/security_events r199583 - in /team/group/security_event...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jun 8 07:44:28 CDT 2009
Author: russell
Date: Mon Jun 8 07:44:25 2009
New Revision: 199583
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=199583
Log:
Add challenge / response / expected response IEs
Modified:
team/group/security_events/include/asterisk/event_defs.h
team/group/security_events/main/event.c
team/group/security_events/main/security_events.c
team/group/security_events/security_events.txt
Modified: team/group/security_events/include/asterisk/event_defs.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/include/asterisk/event_defs.h?view=diff&rev=199583&r1=199582&r2=199583
==============================================================================
--- team/group/security_events/include/asterisk/event_defs.h (original)
+++ team/group/security_events/include/asterisk/event_defs.h Mon Jun 8 07:44:25 2009
@@ -121,25 +121,28 @@
* Payload type: RAW
* This IE indicates which server the event originated from
*/
- AST_EVENT_IE_EID = 0x000A,
- AST_EVENT_IE_SECURITY_EVENT = 0x000B,
- AST_EVENT_IE_EVENT_VERSION = 0x000C,
- AST_EVENT_IE_SERVICE = 0x000D,
- AST_EVENT_IE_MODULE = 0x000E,
- AST_EVENT_IE_ACCOUNT_ID = 0x000F,
- AST_EVENT_IE_SESSION_ID = 0x0010,
- AST_EVENT_IE_SESSION_TV = 0x0011,
- AST_EVENT_IE_ACL_NAME = 0x0012,
- AST_EVENT_IE_LOCAL_ADDR = 0x0013,
- AST_EVENT_IE_REMOTE_ADDR = 0x0014,
- AST_EVENT_IE_EVENT_TV = 0x0015,
- AST_EVENT_IE_REQUEST_TYPE = 0x0016,
- AST_EVENT_IE_REQUEST_PARAMS = 0x0017,
- AST_EVENT_IE_AUTH_METHOD = 0x0018,
- AST_EVENT_IE_SEVERITY = 0x0019,
- AST_EVENT_IE_EXPECTED_ADDR = 0x001A,
+ AST_EVENT_IE_EID = 0x000A,
+ AST_EVENT_IE_SECURITY_EVENT = 0x000B,
+ AST_EVENT_IE_EVENT_VERSION = 0x000C,
+ AST_EVENT_IE_SERVICE = 0x000D,
+ AST_EVENT_IE_MODULE = 0x000E,
+ AST_EVENT_IE_ACCOUNT_ID = 0x000F,
+ AST_EVENT_IE_SESSION_ID = 0x0010,
+ AST_EVENT_IE_SESSION_TV = 0x0011,
+ AST_EVENT_IE_ACL_NAME = 0x0012,
+ AST_EVENT_IE_LOCAL_ADDR = 0x0013,
+ AST_EVENT_IE_REMOTE_ADDR = 0x0014,
+ AST_EVENT_IE_EVENT_TV = 0x0015,
+ AST_EVENT_IE_REQUEST_TYPE = 0x0016,
+ AST_EVENT_IE_REQUEST_PARAMS = 0x0017,
+ AST_EVENT_IE_AUTH_METHOD = 0x0018,
+ AST_EVENT_IE_SEVERITY = 0x0019,
+ AST_EVENT_IE_EXPECTED_ADDR = 0x001A,
+ AST_EVENT_IE_CHALLENGE = 0x001B,
+ AST_EVENT_IE_RESPONSE = 0x001C,
+ AST_EVENT_IE_EXPECTED_RESPONSE = 0x001D,
/*! \brief Must be the last IE value +1 */
- AST_EVENT_IE_TOTAL = 0x001B,
+ AST_EVENT_IE_TOTAL = 0x001E,
};
/*!
Modified: team/group/security_events/main/event.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/main/event.c?view=diff&rev=199583&r1=199582&r2=199583
==============================================================================
--- team/group/security_events/main/event.c (original)
+++ team/group/security_events/main/event.c Mon Jun 8 07:44:25 2009
@@ -201,32 +201,35 @@
enum ast_event_ie_pltype ie_pltype;
const char *name;
} ie_maps[AST_EVENT_IE_TOTAL] = {
- [AST_EVENT_IE_NEWMSGS] = { AST_EVENT_IE_PLTYPE_UINT, "NewMessages" },
- [AST_EVENT_IE_OLDMSGS] = { AST_EVENT_IE_PLTYPE_UINT, "OldMessages" },
- [AST_EVENT_IE_MAILBOX] = { AST_EVENT_IE_PLTYPE_STR, "Mailbox" },
- [AST_EVENT_IE_UNIQUEID] = { AST_EVENT_IE_PLTYPE_UINT, "UniqueID" },
- [AST_EVENT_IE_EVENTTYPE] = { AST_EVENT_IE_PLTYPE_UINT, "EventType" },
- [AST_EVENT_IE_EXISTS] = { AST_EVENT_IE_PLTYPE_UINT, "Exists" },
- [AST_EVENT_IE_DEVICE] = { AST_EVENT_IE_PLTYPE_STR, "Device" },
- [AST_EVENT_IE_STATE] = { AST_EVENT_IE_PLTYPE_UINT, "State" },
- [AST_EVENT_IE_CONTEXT] = { AST_EVENT_IE_PLTYPE_STR, "Context" },
- [AST_EVENT_IE_EID] = { AST_EVENT_IE_PLTYPE_RAW, "EntityID" },
- [AST_EVENT_IE_SECURITY_EVENT] = { AST_EVENT_IE_PLTYPE_STR, "SecurityEvent" },
- [AST_EVENT_IE_EVENT_VERSION] = { AST_EVENT_IE_PLTYPE_UINT, "EventVersion" },
- [AST_EVENT_IE_SERVICE] = { AST_EVENT_IE_PLTYPE_STR, "Service" },
- [AST_EVENT_IE_MODULE] = { AST_EVENT_IE_PLTYPE_STR, "Module" },
- [AST_EVENT_IE_ACCOUNT_ID] = { AST_EVENT_IE_PLTYPE_STR, "AccountID" },
- [AST_EVENT_IE_SESSION_ID] = { AST_EVENT_IE_PLTYPE_STR, "SessionID" },
- [AST_EVENT_IE_SESSION_TV] = { AST_EVENT_IE_PLTYPE_STR, "SessionTV" },
- [AST_EVENT_IE_ACL_NAME] = { AST_EVENT_IE_PLTYPE_STR, "ACLName" },
- [AST_EVENT_IE_LOCAL_ADDR] = { AST_EVENT_IE_PLTYPE_STR, "LocalAddress" },
- [AST_EVENT_IE_REMOTE_ADDR] = { AST_EVENT_IE_PLTYPE_STR, "RemoteAddress" },
- [AST_EVENT_IE_EVENT_TV] = { AST_EVENT_IE_PLTYPE_STR, "EventTV" },
- [AST_EVENT_IE_REQUEST_TYPE] = { AST_EVENT_IE_PLTYPE_STR, "RequestType" },
- [AST_EVENT_IE_REQUEST_PARAMS] = { AST_EVENT_IE_PLTYPE_STR, "RequestParams" },
- [AST_EVENT_IE_AUTH_METHOD] = { AST_EVENT_IE_PLTYPE_STR, "AuthMethod" },
- [AST_EVENT_IE_SEVERITY] = { AST_EVENT_IE_PLTYPE_STR, "Severity" },
- [AST_EVENT_IE_EXPECTED_ADDR] = { AST_EVENT_IE_PLTYPE_STR, "ExpectedAddress" },
+ [AST_EVENT_IE_NEWMSGS] = { AST_EVENT_IE_PLTYPE_UINT, "NewMessages" },
+ [AST_EVENT_IE_OLDMSGS] = { AST_EVENT_IE_PLTYPE_UINT, "OldMessages" },
+ [AST_EVENT_IE_MAILBOX] = { AST_EVENT_IE_PLTYPE_STR, "Mailbox" },
+ [AST_EVENT_IE_UNIQUEID] = { AST_EVENT_IE_PLTYPE_UINT, "UniqueID" },
+ [AST_EVENT_IE_EVENTTYPE] = { AST_EVENT_IE_PLTYPE_UINT, "EventType" },
+ [AST_EVENT_IE_EXISTS] = { AST_EVENT_IE_PLTYPE_UINT, "Exists" },
+ [AST_EVENT_IE_DEVICE] = { AST_EVENT_IE_PLTYPE_STR, "Device" },
+ [AST_EVENT_IE_STATE] = { AST_EVENT_IE_PLTYPE_UINT, "State" },
+ [AST_EVENT_IE_CONTEXT] = { AST_EVENT_IE_PLTYPE_STR, "Context" },
+ [AST_EVENT_IE_EID] = { AST_EVENT_IE_PLTYPE_RAW, "EntityID" },
+ [AST_EVENT_IE_SECURITY_EVENT] = { AST_EVENT_IE_PLTYPE_STR, "SecurityEvent" },
+ [AST_EVENT_IE_EVENT_VERSION] = { AST_EVENT_IE_PLTYPE_UINT, "EventVersion" },
+ [AST_EVENT_IE_SERVICE] = { AST_EVENT_IE_PLTYPE_STR, "Service" },
+ [AST_EVENT_IE_MODULE] = { AST_EVENT_IE_PLTYPE_STR, "Module" },
+ [AST_EVENT_IE_ACCOUNT_ID] = { AST_EVENT_IE_PLTYPE_STR, "AccountID" },
+ [AST_EVENT_IE_SESSION_ID] = { AST_EVENT_IE_PLTYPE_STR, "SessionID" },
+ [AST_EVENT_IE_SESSION_TV] = { AST_EVENT_IE_PLTYPE_STR, "SessionTV" },
+ [AST_EVENT_IE_ACL_NAME] = { AST_EVENT_IE_PLTYPE_STR, "ACLName" },
+ [AST_EVENT_IE_LOCAL_ADDR] = { AST_EVENT_IE_PLTYPE_STR, "LocalAddress" },
+ [AST_EVENT_IE_REMOTE_ADDR] = { AST_EVENT_IE_PLTYPE_STR, "RemoteAddress" },
+ [AST_EVENT_IE_EVENT_TV] = { AST_EVENT_IE_PLTYPE_STR, "EventTV" },
+ [AST_EVENT_IE_REQUEST_TYPE] = { AST_EVENT_IE_PLTYPE_STR, "RequestType" },
+ [AST_EVENT_IE_REQUEST_PARAMS] = { AST_EVENT_IE_PLTYPE_STR, "RequestParams" },
+ [AST_EVENT_IE_AUTH_METHOD] = { AST_EVENT_IE_PLTYPE_STR, "AuthMethod" },
+ [AST_EVENT_IE_SEVERITY] = { AST_EVENT_IE_PLTYPE_STR, "Severity" },
+ [AST_EVENT_IE_EXPECTED_ADDR] = { AST_EVENT_IE_PLTYPE_STR, "ExpectedAddress" },
+ [AST_EVENT_IE_CHALLENGE] = { AST_EVENT_IE_PLTYPE_STR, "Challenge" },
+ [AST_EVENT_IE_RESPONSE] = { AST_EVENT_IE_PLTYPE_STR, "Response" },
+ [AST_EVENT_IE_EXPECTED_RESPONSE] = { AST_EVENT_IE_PLTYPE_STR, "ExpectedResponse" },
};
const char *ast_event_get_type_name(const struct ast_event *event)
Modified: team/group/security_events/main/security_events.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/main/security_events.c?view=diff&rev=199583&r1=199582&r2=199583
==============================================================================
--- team/group/security_events/main/security_events.c (original)
+++ team/group/security_events/main/security_events.c Mon Jun 8 07:44:25 2009
@@ -450,6 +450,9 @@
case AST_EVENT_IE_REQUEST_TYPE:
case AST_EVENT_IE_REQUEST_PARAMS:
case AST_EVENT_IE_AUTH_METHOD:
+ case AST_EVENT_IE_CHALLENGE:
+ case AST_EVENT_IE_RESPONSE:
+ case AST_EVENT_IE_EXPECTED_RESPONSE:
{
const char *str;
Modified: team/group/security_events/security_events.txt
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/security_events.txt?view=diff&rev=199583&r1=199582&r2=199583
==============================================================================
--- team/group/security_events/security_events.txt (original)
+++ team/group/security_events/security_events.txt Mon Jun 8 07:44:25 2009
@@ -230,7 +230,7 @@
IE: SessionID
Content: This is a string used to identify the session associated with the
event. The format of the session identifier is specific to the
- service. In the case of SIP, this would be the call ID.
+ service. In the case of SIP, this would be the call ID.
IE: SessionTV
Content: The time that the session associated with the SessionID started.
@@ -274,6 +274,19 @@
Content: This is a service specific string that represents an authentication
method that was used or requested.
+IE: Challenge
+Content: This is a service specific string that represents the challenge
+ provided to a user attempting challenge/response authentication.
+
+IE: Response
+Content: This is a service specific string that represents the response
+ received from a user attempting challenge/response authentication.
+
+IE: ExpectedResponse
+Content: This is a service specific string that represents the response
+ that was expected to be received from a user attempting
+ challenge/response authentication.
+
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
More information about the svn-commits
mailing list