Changeset 1363
- Timestamp:
- 04/23/12 21:05:32 (13 months ago)
- Location:
- raptor-ica/trunk/src/main
- Files:
-
- 5 edited
-
bin/raptoricad (modified) (1 diff)
-
config/event-parse-formats-system.xml (modified) (2 diffs)
-
config/event-parse.xml (modified) (2 diffs)
-
config/event-release.xml (modified) (1 diff)
-
config/logging.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
raptor-ica/trunk/src/main/bin/raptoricad
r1327 r1363 49 49 javaCommand="java" # name of the Java launcher without the path 50 50 javaExe="$JAVA_HOME/bin/$javaCommand" # file name of the Java application launcher executable 51 javaArgs="-DconfigurationFiles=/opt/raptor/ica/conf/ - Xmx64M -jar raptor-ica.jar -server"51 javaArgs="-DconfigurationFiles=/opt/raptor/ica/conf/ -server -Xmx64M -jar raptor-ica.jar " 52 52 # arguments for Java launcher 53 53 javaCommandLine="$javaExe $javaArgs" # command line to start the Java service application -
raptor-ica/trunk/src/main/config/event-parse-formats-system.xml
r1219 r1363 31 31 32 32 <!-- accepted types are DATE, STRING, INTEGER --> 33 34 35 <bean id="freeRadiusIdpLogFileFormat" class="uk.ac.cardiff.raptor.parse.external.file.format.LogFileFormat"> 36 <property name="headers"> 37 <list> 38 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 39 <property name="fieldName"> 40 <value>eventTime</value> 41 </property> 42 <property name="fieldNo"> 43 <value>0</value> 44 </property> 45 <property name="preserveDelimeterOnFieldConcatenation"> 46 <value>true</value> 47 </property> 48 <property name="additionalFieldNos"> 49 <list> 50 <value>-1</value> 51 </list> 52 </property> 53 <property name="timeZone"> 54 <value>UTC</value> 55 </property> 56 <property name="fieldType"> 57 <value>DATE</value> 58 </property> 59 <property name="dateTimeFormat"> 60 <value>EEE MMM d HH:mm:ss yyyy</value> 61 </property> 62 <property name="regexRetain"> 63 <value>........................</value> 64 </property> 65 <property name="regexReplaceAll"> 66 <map> 67 <entry key=" : Auth" value=""/> 68 </map> 69 </property> 70 </bean> 71 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 72 <property name="fieldName"> 73 <value>principalName</value> 74 </property> 75 <property name="fieldNo"> 76 <value>9</value> 77 </property> 78 <property name="fieldType"> 79 <value>STRING</value> 80 </property> 81 <property name="regexReplaceAll"> 82 <map> 83 <entry key="\[" value=""/> 84 <entry key="\]" value=""/> 85 <entry key="@.*" value=""/> 86 </map> 87 </property> 88 </bean> 89 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 90 <property name="fieldName"> 91 <value>clientIdentifier</value> 92 </property> 93 <property name="fieldNo"> 94 <value>12</value> 95 </property> 96 <property name="additionalFieldNos"> 97 <list> 98 <value>-1</value> 99 </list> 100 </property> 101 <property name="fieldType"> 102 <value>STRING</value> 103 </property> 104 <property name="regexRetain"> 105 <value>.*port</value> 106 </property> 107 <property name="regexReplaceAll"> 108 <map> 109 <entry key="port" value=""/> 110 </map> 111 </property> 112 </bean> 113 </list> 114 </property> 115 <property name="delimeter"> 116 <value> </value> 117 </property> 118 </bean> 33 119 34 120 <bean id="shib13IDPAccessFileFormat" class="uk.ac.cardiff.raptor.parse.external.file.format.LogFileFormat"> … … 110 196 </property> 111 197 </bean> 198 </list> 199 </property> 200 <property name="delimeter"> 201 <value> </value> 202 </property> 203 </bean> 204 205 <bean id="shibSPLogFileFormat" class="uk.ac.cardiff.raptor.parse.external.file.format.LogFileFormat"> 206 <property name="headers"> 207 <list> 208 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 209 <property name="fieldName"> 210 <value>eventTime</value> 211 </property> 212 <property name="fieldNo"> 213 <value>0</value> 214 </property> 215 <property name="additionalFieldNos"> 216 <list> 217 <value>1</value> 218 </list> 219 </property> 220 <property name="timeZone"> 221 <value>UTC</value> 222 </property> 223 <property name="fieldType"> 224 <value>DATE</value> 225 </property> 226 <property name="dateTimeFormat"> 227 <value>yyyy-MM-ddHH:mm:ss</value> 228 </property> 229 </bean> 230 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 231 <property name="fieldName"> 232 <value>sessionId</value> 233 </property> 234 <property name="fieldNo"> 235 <value>9</value> 236 </property> 237 <property name="fieldType"> 238 <value>STRING</value> 239 </property> 240 <property name="regexReplaceAll"> 241 <map> 242 <entry key="\(" value=""/> 243 <entry key="\)" value=""/> 244 </map> 245 </property> 246 </bean> 247 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 248 <property name="fieldName"> 249 <value>serviceId</value> 250 </property> 251 <property name="fieldNo"> 252 <value>11</value> 253 </property> 254 <property name="fieldType"> 255 <value>STRING</value> 256 </property> 257 <property name="regexReplaceAll"> 258 <map> 259 <entry key="\(" value=""/> 260 <entry key="\)" value=""/> 261 </map> 262 </property> 263 </bean> 264 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 265 <property name="fieldName"> 266 <value>protocol</value> 267 </property> 268 <property name="fieldNo"> 269 <value>12</value> 270 </property> 271 <property name="fieldType"> 272 <value>STRING</value> 273 </property> 274 <property name="regexReplaceAll"> 275 <map> 276 <entry key="\(" value=""/> 277 <entry key="\)" value=""/> 278 </map> 279 </property> 280 </bean> 281 <bean class="uk.ac.cardiff.raptor.parse.external.file.format.Header"> 282 <property name="fieldName"> 283 <value>clientIp</value> 284 </property> 285 <property name="fieldNo"> 286 <value>14</value> 287 </property> 288 <property name="fieldType"> 289 <value>STRING</value> 290 </property> 291 <property name="regexReplaceAll"> 292 <map> 293 <entry key="\(" value=""/> 294 <entry key="\)" value=""/> 295 </map> 296 </property> 297 </bean> 112 298 </list> 113 299 </property> -
raptor-ica/trunk/src/main/config/event-parse.xml
r1354 r1363 56 56 57 57 <bean id="ezproxyLFP" class="uk.ac.cardiff.raptor.parse.external.file.LogFileParser"> 58 <property name="enabled" value=" true"/>58 <property name="enabled" value="false"/> 59 59 <property name="eventHandler"><ref bean="memoryEventHandler"></ref></property> 60 60 <property name="logfile"> … … 122 122 123 123 </bean> 124 125 <!-- Shibboleth 2 SP --> 126 <bean id="shibbolethSpLFP" class="uk.ac.cardiff.raptor.parse.external.file.LogFileParser"> 127 <property name="enabled" value="false"/> 128 <property name="eventHandler"><ref bean="memoryEventHandler"></ref></property> 129 <property name="logfile"> 130 <value>file:///Users/philsmart/Documents/DataSets/Logs/shibsp-example.log 131 </value> 132 </property> 133 <property name="format"> 134 <ref bean="shibSPLogFileFormat" /> 135 </property> 136 <property name="eventType"> 137 <value>uk.ac.cardiff.model.event.ShibbolethSpAuthenticationEvent</value> 138 </property> 139 <property name="printParsingPosition"><value>true</value></property> 140 141 <property name="LineFilterEngine"> 142 <bean id="lineFilterEngineShibSp" class="uk.ac.cardiff.raptor.parse.filter.LineFilterEngine"> 143 <property name="includeLineFilters"> 144 <list> 145 <bean class="uk.ac.cardiff.raptor.parse.filter.ContainsLineFilter"> 146 <property name="includeIfContains"><value>new session created</value></property> 147 </bean> 148 </list> 149 </property> 150 </bean> 151 </property> 152 </bean> 153 154 <!-- OpenRadius --> 155 <bean id="freeRadiusLFP" class="uk.ac.cardiff.raptor.parse.external.file.LogFileParser"> 156 <property name="enabled" value="true"/> 157 <property name="eventHandler"><ref bean="memoryEventHandler"></ref></property> 158 <property name="logfile"> 159 <value>file:///Users/philsmart/Documents/DataSets/Logs/radius.log 160 </value> 161 </property> 162 <property name="format"> 163 <ref bean="freeRadiusIdpLogFileFormat" /> 164 </property> 165 <property name="eventType"> 166 <value>uk.ac.cardiff.model.event.RadiusAuthenticationEvent</value> 167 </property> 168 <property name="printParsingPosition"><value>true</value></property> 169 170 <property name="LineFilterEngine"> 171 <bean id="lineFilteropenRadiusLFP" class="uk.ac.cardiff.raptor.parse.filter.LineFilterEngine"> 172 <property name="includeLineFilters"> 173 <list> 174 <bean class="uk.ac.cardiff.raptor.parse.filter.ContainsRegexLineFilter"> 175 <property name="includeIfContainsRegex"><value>Auth: Login OK.*via TLS tunnel</value></property> 176 </bean> 177 </list> 178 </property> 179 </bean> 180 </property> 181 <property name="exclusionList"> 182 <bean class="uk.ac.cardiff.raptor.parse.filter.ExclusionList"> 183 <property name="exclusionEntries"> 184 <list> 185 <bean class ="uk.ac.cardiff.raptor.parse.filter.match.RegexExclusionEntry"> 186 <property name ="fieldName" value="principalName"/> 187 <property name="match" value="@"/> 188 </bean> 189 </list> 190 </property> 191 </bean> 192 </property> 193 </bean> 194 124 195 </list> 125 196 </property> -
raptor-ica/trunk/src/main/config/event-release.xml
r1042 r1363 37 37 <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethIdpAuthenticationEvent</value> 38 38 <value type="java.lang.Class">uk.ac.cardiff.model.event.EzproxyAuthenticationEvent</value> 39 <value type="java.lang.Class">uk.ac.cardiff.model.event.RadiusAuthenticationEvent</value> 40 <value type="java.lang.Class">uk.ac.cardiff.model.event.ShibbolethSpAuthenticationEvent</value> 39 41 </list> 40 42 </property> -
raptor-ica/trunk/src/main/config/logging.xml
r1354 r1363 47 47 </logger> 48 48 49 <logger name="uk.ac.cardiff" level=" trace">49 <logger name="uk.ac.cardiff" level="debug"> 50 50 <appender-ref ref="stdout"/> 51 51 <appender-ref ref="FILE"/>
Note: See TracChangeset
for help on using the changeset viewer.
