Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Dave B. <bla...@us...> - 2013-09-12 13:14:30
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24389/src/org/sblim/cimclient/internal/util Modified Files: WBEMConfiguration.java WBEMConfigurationDefaults.java Log Message: 2151 gzip compression not supported Index: WBEMConfigurationDefaults.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfigurationDefaults.java,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- WBEMConfigurationDefaults.java 20 Aug 2013 12:10:52 -0000 1.36 +++ WBEMConfigurationDefaults.java 12 Sep 2013 13:14:28 -0000 1.37 @@ -41,6 +41,7 @@ * 2628 2013-03-26 blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port * 2654 2013-07-29 blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF + * 2151 2013-08-20 blaschke-oss gzip compression not supported */ package org.sblim.cimclient.internal.util; @@ -326,4 +327,9 @@ */ public static final String SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES = "false"; + /** + * ENABLE_GZIP_ENCODING + */ + public static final String ENABLE_GZIP_ENCODING = "false"; + } Index: WBEMConfiguration.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- WBEMConfiguration.java 20 Aug 2013 12:10:52 -0000 1.54 +++ WBEMConfiguration.java 12 Sep 2013 13:14:28 -0000 1.55 @@ -52,6 +52,7 @@ * 2647 2013-07-01 blaschke-oss Add two ssl protocol properties for http server and client * 2653 2013-07-26 blaschke-oss FVT: java.lang.ExceptionInInitializerError during static init * 2654 2013-07-29 blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF + * 2151 2013-08-20 blaschke-oss gzip compression not supported */ package org.sblim.cimclient.internal.util; @@ -1179,4 +1180,16 @@ WBEMConfigurationDefaults.SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES)) .booleanValue(); } + + /** + * Returns the state of gzip encoding enablement. + * + * @return <code>true</code> if gzip encoding is enabled, <code>false</code> + * otherwise + */ + public boolean isGzipEncodingEnabled() { + return Boolean.valueOf( + getProperty(WBEMConfigurationProperties.ENABLE_GZIP_ENCODING, + WBEMConfigurationDefaults.ENABLE_GZIP_ENCODING)).booleanValue(); + } } |
|
From: Dave B. <bla...@us...> - 2013-09-12 12:24:06
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22447/src/org/sblim/cimclient/doc-files Modified Files: Tag: Experimental history.html Log Message: 2661 Update detailed release history HTML for 2.2.4 Index: history.html =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/history.html,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -d -r1.1.2.9 -r1.1.2.10 --- history.html 30 May 2013 12:09:08 -0000 1.1.2.9 +++ history.html 12 Sep 2013 12:24:04 -0000 1.1.2.10 @@ -25,6 +25,7 @@ * 2615 2013-02-21 blaschke-oss Add Allura links to detailed release history HTML * 2624 2013-03-14 blaschke-oss Update detailed release history HTML for 2.2.2 * 2643 2013-05-30 blaschke-oss Update detailed release history HTML for 2.2.3 + * 2661 2013-09-12 blaschke-oss Update detailed release history HTML for 2.2.4 --> </head> <body style="background-color: white;"> @@ -46,9 +47,9 @@ unique code streams:</p> <table border="1" cellpadding="5" cellspacing="0" width="75%"> <tr><th>Code Stream</th><th>Versions</th><th>Java Version</th><th>State</th> - <tr><td>2.0.x</td><td><a href="#201">2.0.1</a>, <a href="#202">2.0.2</a>, <a href="#203">2.0.3</a>, <a href="#204">2.0.4</a>, <a href="#205">2.0.5</a>, <a href="#206">2.0.6</a>, <a href="#207">2.0.7</a>, <a href="#208">2.0.8</a>, <a href="#209">2.0.9</a></td><td>1.4</td><td>Sunset December 2010</td> + <tr><td>2.0.x</td><td><a href="#201">2.0.1</a>, <a href="#202">2.0.2</a>, <a href="#203">2.0.3</a>, <a href="#204">2.0.4</a>, <a href="#205">2.0.5</a>, <a href="#206">2.0.6</a>, <a href="#207">2.0.7</a>, <a href="#208">2.0.8</a>, <a href="#209">2.0.9</a></td><td>1.4</td><td>Maintenance mode December 2008, sunset December 2010</td> <tr><td>2.1.x</td><td><a href="#210">2.1.0</a>, <a href="#211">2.1.1</a>, <a href="#212">2.1.2</a>, <a href="#213">2.1.3</a>, <a href="#214">2.1.4</a>, <a href="#215">2.1.5</a>, <a href="#216">2.1.6</a>, <a href="#217">2.1.7</a>, <a href="#218">2.1.8</a>, <a href="#219">2.1.9</a>, <a href="#2110">2.1.10</a>, <a href="#2111">2.1.11</a>, <a href="#2112">2.1.12</a></td><td>1.5</td><td>Maintenance mode September 2012</td> - <tr><td>2.2.x</td><td><a href="#220">2.2.0</a>, <a href="#221">2.2.1</a>, <a href="#222">2.2.2</a>, <a href="#223">2.2.3</a></td><td>1.5</td><td>Active</td> + <tr><td>2.2.x</td><td><a href="#220">2.2.0</a>, <a href="#221">2.2.1</a>, <a href="#222">2.2.2</a>, <a href="#223">2.2.3</a>, <a href="#224">2.2.4</a></td><td>1.5</td><td>Active</td> </table> <p>The SBLIM CIM Client for Java continues to ship on a quarterly basis, as close as possible to the middle (15th) of the last month of each @@ -59,6 +60,47 @@ SourceForge will forward requests for the old (Classic) bug IDs to the new (Allura) IDs for some indeterminate amount of time, so to be safe both links are included below, where appropriate.</p> + <a name="224"><h2>Version 2.2.4</h2></a> + <p>Version 2.2.4 was released on September 13, 2013. It contains three + new features:</p> + <ul> + <li>Two new Java properties - sblim.wbem.sslClientProtocol and + sblim.wbem.sslListenerProtocol - can be used to set the protocol + used for SSLContext.getInstance(String protocol) by a client or + listener. (#2647)</li> + <li>One new Java property - sblim.wbem.socketIdleTimeout - can be + used to automatically reset (close, then reopen) a socket if it + is idle for too long. (#2654)</li> + <li>One new Java property - sblim.wbem.enableGzipEncoding - can be + used to enable support for gzip decompression of CIM-XML responses, + identified by "Content-Encoding: gzip" header. (#2151)</li> + </ul> + <p>Version 2.2.4 also contains two changes that might affect existing + applications:</p> + <ul> + <li>The internal API LogAndTraceBroker.setXmlTraceStream no longer + closes the previous XML trace stream. (#2652)</li> + <li>The JSR48 API CIMObjectPath.equalsModelPath now compares only + the model path - this may produce different results from previous + releases. (#2660)</li> + </ul> + <p>The complete list of changes follows:</p> + <table border="1" cellpadding="5" cellspacing="0" width="100%"> + <tr><th>Classic Bug ID</th><th>Allura Bug ID</th><th>Bug Summary</th></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2647/">2647</a></td><td>Add two ssl protocol properties for http server and client</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602605&group_id=128809&atid=712784">3602605</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2604/">2604</a></td><td>SAXException messages should contain node name</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2650/">2650</a></td><td>SLP opaque value handling incorrect</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2652/">2652</a></td><td>LogAndTraceBroker.setXmlTraceStream should not close previous stream</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2653/">2653</a></td><td>FVT: java.lang.ExceptionInInitializerError during static init</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2654/">2654</a></td><td>Check jcc idle time with CIMOM keepalive timeout to avoid EOF</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2651/">2651</a></td><td>IOException when tracing the cimxml</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2655/">2655</a></td><td>Content-length must be ignored when Transfer-encoding present</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3194689&group_id=128809&atid=712784">3194689</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2151/">2151</a></td><td>gzip compression not supported</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2657/">2657</a></td><td>Potential null pointer exception in handleConnection</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2660/">2660</a></td><td>CIMObjectPath.equalsModelPath same as equals</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2662/">2662</a></td><td>Need the specific SSLHandshakeException during the cim call</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2661/">2661</a></td><td>Update detailed release history HTML for 2.2.4</td></tr> + </table> <a name="223"><h2>Version 2.2.3</h2></a> <p>Version 2.2.3 was released on May 31, 2013. It contains several new features:</p> @@ -97,7 +139,7 @@ <table border="1" cellpadding="5" cellspacing="0" width="100%"> <tr><th>Classic Bug ID</th><th>Allura Bug ID</th><th>Bug Summary</th></tr> <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2628/">2628</a></td><td>Limit size of LinkedList of CIMEvents to be dispatched</td></tr> - <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602606&group_id=128809&atid=712784">3602606</td><td><a href="http://sourceforge.net/p/sblim/bugs/2605/">2605</a></td><td>SAX parser throws wrong exception</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602606&group_id=128809&atid=712784">3602606</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2605/">2605</a></td><td>SAX parser throws wrong exception</td></tr> <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2632/">2632</a></td><td>Potential Null Point Exception in CIMDataType</td></tr> <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2636/">2636</a></td><td>Nested embedded instances cause CIMXMLParseException</td></tr> <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2637/">2637</a></td><td>Add nested embedded instance builder test</td></tr> @@ -133,10 +175,10 @@ <p>The complete list of changes follows:</p> <table border="1" cellpadding="5" cellspacing="0" width="100%"> <tr><th>Classic Bug ID</th><th>Allura Bug ID</th><th>Bug Summary</th></tr> - <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3596303&group_id=128809&atid=712784">3596303</td><td><a href="http://sourceforge.net/p/sblim/bugs/2580/">2580</a></td><td>windows http response WWW-Authenticate: Negotiate fails</td></tr> - <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3598613&group_id=128809&atid=712784">3598613</td><td><a href="http://sourceforge.net/p/sblim/bugs/2585/">2585</a></td><td>different data type in cim instance and cim object path</td></tr> - <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3601894&group_id=128809&atid=712784">3601894</td><td><a href="http://sourceforge.net/p/sblim/bugs/2600/">2600</a></td><td>Enhance HTTP and CIM-XML tracing</td></tr> - <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602604&group_id=128809&atid=712784">3602604</td><td><a href="http://sourceforge.net/p/sblim/bugs/2603/">2603</a></td><td>Clean up SAXException messages</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3596303&group_id=128809&atid=712784">3596303</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2580/">2580</a></td><td>windows http response WWW-Authenticate: Negotiate fails</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3598613&group_id=128809&atid=712784">3598613</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2585/">2585</a></td><td>different data type in cim instance and cim object path</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3601894&group_id=128809&atid=712784">3601894</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2600/">2600</a></td><td>Enhance HTTP and CIM-XML tracing</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3602604&group_id=128809&atid=712784">3602604</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2603/">2603</a></td><td>Clean up SAXException messages</td></tr> <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2614/">2614</a></td><td>Remove redundant code in transmitRequest</td></tr> <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2615/">2615</a></td><td>Add Allura links to detailed release history HTML</td></tr> <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2619/">2619</a></td><td>Host should contain port when not 5988/5989</td></tr> |
|
From: Tyrel D. <ty...@us...> - 2013-09-11 23:54:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gather - Metric Data Gatherer".
The branch, master has been updated
via e70a1b2a87439737581d0a8e404cc9952b2e644c (commit)
from 3835ad76a630fef17cc4733360912a74a4af8d02 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e70a1b2a87439737581d0a8e404cc9952b2e644c
Author: Tyrel Datwyler <ty...@li...>
Date: Wed Sep 11 16:29:20 2013 -0700
Fixed #2664: no guest counter in /proc/stat on older kernels
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
plugin/repositoryOperatingSystem.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/NEWS b/NEWS
index bb94222..9fc1129 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
Bugs fixed:
- #2633 local FS metris calculated inconsitently
+- #2664 no guest counter in /proc/stat on older kernels
Changes in Version 2.2.8
========================
diff --git a/plugin/repositoryOperatingSystem.c b/plugin/repositoryOperatingSystem.c
index 9719dc8..6e20b17 100644
--- a/plugin/repositoryOperatingSystem.c
+++ b/plugin/repositoryOperatingSystem.c
@@ -2004,6 +2004,7 @@ unsigned long long os_getCPUStealTime( char * data ) {
char * end = NULL;
char time[128];
unsigned long long val = 0;
+ int len_end = 0;
if( (hlp = strchr(data, ':')) != NULL ) {
hlp++;
@@ -2021,7 +2022,9 @@ unsigned long long os_getCPUStealTime( char * data ) {
hlp++;
end = strchr(hlp, ':');
memset(time,0,sizeof(time));
- strncpy(time, hlp, (strlen(hlp)-strlen(end)) );
+ if(end!=NULL)
+ len_end = strlen(end);
+ strncpy(time, hlp, (strlen(hlp)-len_end));
val = strtoll(time,(char**)NULL,10)*10;
}
hooks/post-receive
--
gather - Metric Data Gatherer
|
|
From: Dave B. <bla...@us...> - 2013-09-10 15:51:30
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32574/src/org/sblim/cimclient/internal/wbem Modified Files: Tag: Experimental WBEMClientCIMXML.java Log Message: 2662 Need the specific SSLHandshakeException during the cim call Index: WBEMClientCIMXML.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v retrieving revision 1.21.2.76 retrieving revision 1.21.2.77 diff -u -d -r1.21.2.76 -r1.21.2.77 --- WBEMClientCIMXML.java 31 Jul 2013 14:19:22 -0000 1.21.2.76 +++ WBEMClientCIMXML.java 10 Sep 2013 15:51:27 -0000 1.21.2.77 @@ -73,6 +73,7 @@ * 2614 2013-02-21 blaschke-oss Remove redundant code in transmitRequest * 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication() * 2651 2013-07-31 blaschke-oss IOException when tracing the cimxml + * 2662 2013-09-10 blaschke-oss Need the specific SSLHandshakeException during the cim call */ package org.sblim.cimclient.internal.wbem; @@ -109,6 +110,7 @@ import javax.cim.UnsignedInteger32; import javax.cim.UnsignedInteger64; import javax.net.SocketFactory; +import javax.net.ssl.SSLHandshakeException; import javax.security.auth.Subject; import javax.wbem.CloseableIterator; import javax.wbem.WBEMException; @@ -1723,6 +1725,9 @@ throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Unknown host", null, e); } catch (SocketException e) { throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Unable to connect", null, e); + } catch (SSLHandshakeException e) { + throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception", + null, e); } OutputStream os = connection.getOutputStream(); @@ -1752,6 +1757,10 @@ connection.disconnect(); throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Connection timed out", null, e); + } catch (SSLHandshakeException e) { + connection.disconnect(); + throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception", + null, e); } HttpHeader headers = parseHeaders(connection); |
|
From: Dave B. <bla...@us...> - 2013-09-09 15:59:05
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5765/src/org/sblim/cimclient/internal/http Modified Files: MessageReader.java HttpClient.java Log Message: 2655 Content-length must be ignored when Transfer-encoding present Index: MessageReader.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/MessageReader.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- MessageReader.java 30 May 2013 12:25:24 -0000 1.10 +++ MessageReader.java 9 Sep 2013 15:59:02 -0000 1.11 @@ -23,6 +23,7 @@ * 3601894 2013-01-23 blaschke-oss Enhance HTTP and CIM-XML tracing * 2621 2013-02-23 blaschke-oss Not all chunked input has trailers * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port + * 2655 2013-08-14 blaschke-oss Content-length must be ignored when Transfer-encoding present */ package org.sblim.cimclient.internal.http; @@ -66,21 +67,18 @@ this.iMethod = new HttpServerMethod(pStream); this.iHeader = new HttpHeader(pStream, pTimeout); - // TODO: Add support for chunked, and bounded input stream String encoding = this.iHeader.getField("Transfer-Encoding"); if ((encoding != null) && (encoding.toLowerCase().endsWith("chunked"))) { this.iChunked = true; } String length = this.iHeader.getField("Content-Length"); int contentLength = -1; - if (length != null) { + if (length != null && length.length() > 0) { try { contentLength = Integer.parseInt(length); } catch (Exception e) { - contentLength = -1; - - LogAndTraceBroker logger = LogAndTraceBroker.getBroker(); - logger.trace(Level.FINER, "Exception while parsing http content-length", e); + LogAndTraceBroker.getBroker().trace(Level.FINER, + "Exception while parsing http content-length", e); } } String contentType = this.iHeader.getField("Content-Type"); @@ -91,18 +89,18 @@ } catch (Exception e) { encoding = "UTF-8"; // TODO is this the default character // encoding? - LogAndTraceBroker logger = LogAndTraceBroker.getBroker(); - logger.trace(Level.FINER, "Exception while parsing http content-type", e); + LogAndTraceBroker.getBroker().trace(Level.FINER, + "Exception while parsing http content-type", e); } this.iEncoding = encoding; } + + this.iContent = new PersistentInputStream(pStream, isPersistentConnectionSupported()); if (this.iChunked) { - this.iContent = new ChunkedInputStream(new PersistentInputStream(pStream, - isPersistentConnectionSupported()), this.iHeader.getField("Trailer"), + this.iContent = new ChunkedInputStream(this.iContent, this.iHeader.getField("Trailer"), "Indication Request"); - } else { - this.iContent = new BoundedInputStream(new PersistentInputStream(pStream, - isPersistentConnectionSupported()), contentLength); + } else if (contentLength >= 0) { + this.iContent = new BoundedInputStream(this.iContent, contentLength); } } Index: HttpClient.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/HttpClient.java,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- HttpClient.java 20 Aug 2013 12:10:53 -0000 1.49 +++ HttpClient.java 9 Sep 2013 15:59:02 -0000 1.50 @@ -72,6 +72,7 @@ * 2618 2013-02-27 blaschke-oss Need to add property to disable weak cipher suites for the secure indication * 2642 2013-05-21 blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers * 2654 2013-07-29 blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF + * 2655 2013-08-14 blaschke-oss Content-length must be ignored when Transfer-encoding present */ package org.sblim.cimclient.internal.http; @@ -744,14 +745,17 @@ String transferEncoding = this.iResponseHeaders .getField("Transfer-encoding"); - - if (transferEncoding != null - && transferEncoding.toLowerCase().endsWith("chunked")) { - this.iServerInput = new ChunkedInputStream(this.iServerInput, - this.iResponseHeaders.getField("Trailer"), "Response"); - this.iKeepAlive = true; + if (transferEncoding != null) { + length = -1; // ignore Content-length + if (transferEncoding.toLowerCase().endsWith("chunked")) { + this.iServerInput = new ChunkedInputStream(this.iServerInput, + this.iResponseHeaders.getField("Trailer"), "Response"); + this.iKeepAlive = true; + } } - this.iServerInput = new BoundedInputStream(this.iServerInput, length); + + if (length >= 0) this.iServerInput = new BoundedInputStream( + this.iServerInput, length); logger.trace(Level.FINER, "KeepAlive=" + (this.iKeepAlive ? "true" : "false")); |
|
From: Dave B. <bla...@us...> - 2013-09-04 10:29:18
|
Update of /cvsroot/sblim/jsr48-client/src/javax/cim In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5045/src/javax/cim Modified Files: Tag: Experimental CIMObjectPath.java Log Message: 2660 CIMObjectPath.equalsModelPath same as equals Index: CIMObjectPath.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMObjectPath.java,v retrieving revision 1.11.2.23 retrieving revision 1.11.2.24 diff -u -d -r1.11.2.23 -r1.11.2.24 --- CIMObjectPath.java 23 Aug 2012 12:37:29 -0000 1.11.2.23 +++ CIMObjectPath.java 4 Sep 2013 10:29:15 -0000 1.11.2.24 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -33,6 +33,7 @@ * 3521131 2012-04-24 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP + * 2660 2013-09-04 blaschke-oss CIMObjectPath.equalsModelPath same as equals */ package javax.cim; @@ -419,14 +420,22 @@ */ @Override public boolean equals(Object pObj) { + return equalsWorker(pObj, true); + } + + private boolean equalsWorker(Object pObj, boolean pIncludeNamespacePath) { if (!(pObj instanceof CIMObjectPath)) return false; CIMObjectPath that = (CIMObjectPath) pObj; // hostname information is not any longer part of the comparison, since // there is no reliable way to attach hostnames - return (this.iNamespace == null ? that.iNamespace == null : this.iNamespace - .equalsIgnoreCase(that.iNamespace)) - && (this.iObjectName == null ? that.iObjectName == null : this.iObjectName - .equalsIgnoreCase(that.iObjectName)) && keysEqual(that); + if (pIncludeNamespacePath) { + boolean namespaceEqual = (this.iNamespace == null ? that.iNamespace == null + : this.iNamespace.equalsIgnoreCase(that.iNamespace)); + if (!namespaceEqual) return false; + } + return (this.iObjectName == null ? that.iObjectName == null : this.iObjectName + .equalsIgnoreCase(that.iObjectName)) + && keysEqual(that); } /** @@ -513,8 +522,7 @@ * object, otherwise <code>false</code>. */ public boolean equalsModelPath(CIMObjectPath pModelPath) { - // FIXME: what should this function do? - return equals(pModelPath); + return equalsWorker(pModelPath, false); } /** |
|
From: Dave H. <hel...@us...> - 2013-08-23 14:20:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via eb187a794985689cc1c84adbe6192697c30e6dec (commit)
from d2ed326af86b51f618fb7cd43056a2cdfaf77eb3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eb187a794985689cc1c84adbe6192697c30e6dec
Author: Dave Heller <hel...@us...>
Date: Fri Aug 23 10:19:24 2013 -0400
[sfcb-tix:#56] Intermittent segfault at shutdown
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
sfcBroker.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 5713c29..9fd9865 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ Changes in 1.3.18
New features:
Bugs fixed:
-
+- [sfcb-tix:#56] Intermittent segfault at shutdown
Changes in 1.3.17
================
diff --git a/sfcBroker.c b/sfcBroker.c
index 7bb5bb7..9a04d77 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -253,9 +253,10 @@ static void stopBroker(void *p)
free((void *)sfcBrokerStart);
pthread_mutex_unlock(&syncMtx);
- _SFCB_TRACE_STOP();
unloadHostnameLib();
+
+ _SFCB_TRACE_STOP();
if (restartBroker) {
char *emsg=strerror(errno);
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2013-08-21 19:43:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcc- Small Footprint CIM Client".
The branch, master has been updated
via b732c86a2dc5083524ebc52593310771fe5c31c2 (commit)
from 6007f3bf75a515e1f47cdbbab62fdc2f2ff981a3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b732c86a2dc5083524ebc52593310771fe5c31c2
Author: buccella <buc...@li...>
Date: Wed Aug 21 15:43:15 2013 -0400
[bugs:#2658] SFCC should dlopen the versioned .so
-----------------------------------------------------------------------
Summary of changes:
cimc/cimcclient.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cimc/cimcclient.c b/cimc/cimcclient.c
index 73865dc..320afbd 100644
--- a/cimc/cimcclient.c
+++ b/cimc/cimcclient.c
@@ -41,6 +41,10 @@
id - the interface to use, either XML or SfcbLocal
options - options passed to the given backend (ops in cimc.h)
+ todo: for the next interface revamp, passing in a version number
+ would be a good idea, so we could allow for dlopening different
+ versions of .so libs
+
*/
CIMCEnv* NewCIMCEnv(const char *id, unsigned int options, int *rc, char **msg)
{
@@ -61,9 +65,9 @@ CIMCEnv* NewCIMCEnv(const char *id, unsigned int options, int *rc, char **msg)
} else {
if ((strcmp(id, "SfcbLocal") == 0) &&
(stat(SFCB_LIBDIR, &sbuf) == 0)) {
- snprintf(libName, LIBLEN, "%s/libcimcClient%s.so",SFCB_LIBDIR,id);
+ snprintf(libName, LIBLEN, "%s/libcimcClient%s.so.0",SFCB_LIBDIR,id);
} else {
- snprintf(libName, LIBLEN, "libcimcClient%s.so",id);
+ snprintf(libName, LIBLEN, "libcimcClient%s.so.0",id);
}
library = dlopen(libName, RTLD_NOW);
if (library==NULL) {
hooks/post-receive
--
sfcc- Small Footprint CIM Client
|
|
From: Dave H. <hel...@us...> - 2013-08-21 16:50:16
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via d2ed326af86b51f618fb7cd43056a2cdfaf77eb3 (commit)
from 3ba4a96248139309b191d34cefee83b1c2093708 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d2ed326af86b51f618fb7cd43056a2cdfaf77eb3
Author: Dave Heller <hel...@us...>
Date: Wed Aug 21 12:47:43 2013 -0400
bump version number
-----------------------------------------------------------------------
Summary of changes:
NEWS | 8 ++++++++
configure.ac | 2 +-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/NEWS b/NEWS
index 781b6fe..5713c29 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Changes in 1.3.18
+================
+
+New features:
+
+Bugs fixed:
+
+
Changes in 1.3.17
================
diff --git a/configure.ac b/configure.ac
index 9a970b4..98f0bc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(Small Footprint CIM Broker, 1.3.17, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.3.18-preview, sbl...@li..., sblim-sfcb)
AC_CONFIG_SRCDIR([providerDrv.c])
#disable "seems to ignore the --datarootdir setting" warnings
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-08-21 16:46:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The tag, SFCB_1_3_17 has been created
at 3ba4a96248139309b191d34cefee83b1c2093708 (commit)
- Log -----------------------------------------------------------------
commit 3ba4a96248139309b191d34cefee83b1c2093708
Author: Dave Heller <hel...@us...>
Date: Tue Aug 20 20:11:28 2013 -0400
prep for 1.3.17 release
-----------------------------------------------------------------------
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2013-08-21 12:03:44
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11276 Modified Files: Tag: CIM_CLIENT_2_1_4_M build.xml ChangeLog sblim-cim-client2.spec Log Message: 2.1.4.1 release work Index: sblim-cim-client2.spec =================================================================== RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -u -d -r1.17.2.1 -r1.17.2.2 --- sblim-cim-client2.spec 16 Mar 2010 00:03:26 -0000 1.17.2.1 +++ sblim-cim-client2.spec 21 Aug 2013 12:03:41 -0000 1.17.2.2 @@ -1,7 +1,7 @@ %define name sblim-cim-client2 %define project_folder %{name}-%{version}-src %define archive_folder build -%define version 2.1.4 +%define version 2.1.4.1 %define release 1jpp %define section free @@ -158,6 +158,10 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Aug 21 2013 Dave Blaschke <bla...@us...> +- Maintenance release 2.1.4.1 + o 2635 Slowloris DoS attack for CIM indication listener port + * Mon Mar 15 2010 Dave Blaschke <bla...@us...> - New release 2.1.4 o 2970881 Add property to control EmbeddedObject case Index: build.xml =================================================================== RCS file: /cvsroot/sblim/jsr48-client/build.xml,v retrieving revision 1.41.2.1 retrieving revision 1.41.2.2 diff -u -d -r1.41.2.1 -r1.41.2.2 --- build.xml 16 Mar 2010 00:03:26 -0000 1.41.2.1 +++ build.xml 21 Aug 2013 12:03:41 -0000 1.41.2.2 @@ -1,7 +1,7 @@ <!-- build.xml - (C) Copyright IBM Corp. 2005, 2010 + (C) Copyright IBM Corp. 2005, 2013 THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -32,11 +32,11 @@ <!-- set global properties for this build --> <property environment="env" /> - <property name="Base.copyright" value="Copyright (C) IBM Corp. 2005, 2010" /> + <property name="Base.copyright" value="Copyright (C) IBM Corp. 2005, 2013" /> <property name="Manifest.name" value="SBLIM CIM Client for Java" /> <property name="Manifest.title" value="SBLIM CIM Client for Java" /> - <property name="Manifest.vendor" value="IBM Corporation 2005, 2010" /> - <property name="Manifest.version" value="2.1.4" /> + <property name="Manifest.vendor" value="IBM Corporation 2005, 2013" /> + <property name="Manifest.version" value="2.1.4.1" /> <property name="Directory.source.core" value="${basedir}/src" /> <property name="Directory.source.samples" value="${basedir}/smpl" /> @@ -206,7 +206,7 @@ packages="org.sblim.cimclient.internal*:org.sblim.slp.internal*"/> <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/> <doctitle><![CDATA[<h1>SBLIM CIM Client for Java - ${Manifest.version} - Public API Specification</h1>]]></doctitle> - <bottom><![CDATA[<i>Copyright © 2005, 2010 IBM Corporation. All Rights Reserved.</i>]]></bottom> + <bottom><![CDATA[<i>Copyright © 2005, 2013 IBM Corporation. All Rights Reserved.</i>]]></bottom> </javadoc> </target> Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/jsr48-client/ChangeLog,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -d -r1.16 -r1.16.2.1 --- ChangeLog 15 Mar 2010 22:58:05 -0000 1.16 +++ ChangeLog 21 Aug 2013 12:03:41 -0000 1.16.2.1 @@ -1,3 +1,23 @@ +Release 2.1.4.1 +=============== + +Wed Aug 21 05:14:35 CDT 2013 blaschke-oss + + 2635 Slowloris DoS attack for CIM indication listener port + + testcases.txt 1.17.6.1 + WBEMConstants.java 1.14.4.1 + WBEMConfigurationDefaults.java 1.21.2.2 + WBEMConfiguration.java 1.30.2.1 + WBEMListenerSBLIM.java 1.11.8.1 + WBEMConfigurationProperties.java 1.29.2.2 + sblim-cim-client2.properties 1.13.2.2 + NEWS 1.139.2.1 + WBEMListenerTest.java 1.5.4.2 + MessageReader.java 1.6.10.1 + HttpHeader.java 1.10.10.1 + HttpConnectionHandler.java 1.7.8.1 + Release 2.1.4 ============= |
|
From: Dave B. <bla...@us...> - 2013-08-21 10:14:38
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7383/src/org/sblim/cimclient/internal/util Modified Files: Tag: CIM_CLIENT_2_1_4_M WBEMConstants.java WBEMConfigurationDefaults.java WBEMConfiguration.java Log Message: 2635 Slowloris DoS attack for CIM indication listener port Index: WBEMConfigurationDefaults.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfigurationDefaults.java,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -u -d -r1.21.2.1 -r1.21.2.2 --- WBEMConfigurationDefaults.java 16 Mar 2010 00:49:26 -0000 1.21.2.1 +++ WBEMConfigurationDefaults.java 21 Aug 2013 10:14:35 -0000 1.21.2.2 @@ -1,7 +1,7 @@ /** * WBEMConfigurationDefaults.java * - * (C) Copyright IBM Corp. 2006, 2010 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -27,6 +27,7 @@ * 2884718 2009-10-23 blaschke-oss Merge JSR48 and SBLIM client properties * 2930341 2010-01-12 blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0 * 2970881 2010-03-15 blaschke-oss Add property to control EmbeddedObject case + * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port */ package org.sblim.cimclient.internal.util; @@ -208,6 +209,16 @@ public static final String LISTENER_HTTP_TIMEOUT = "10000"; /** + * LISTENER_HTTP_HEADER_TIMEOUT + */ + public static final String LISTENER_HTTP_HEADER_TIMEOUT = "30000"; + + /** + * LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS + */ + public static final String LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS = "0"; + + /** * LISTENER_MAX_POOL_SIZE */ public static final String LISTENER_MAX_POOL_SIZE = "8"; Index: WBEMConstants.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConstants.java,v retrieving revision 1.14 retrieving revision 1.14.4.1 diff -u -d -r1.14 -r1.14.4.1 --- WBEMConstants.java 17 Nov 2009 19:39:34 -0000 1.14 +++ WBEMConstants.java 21 Aug 2013 10:14:35 -0000 1.14.4.1 @@ -1,7 +1,7 @@ /** * CIMClientConstants.java * - * (C) Copyright IBM Corp. 2006, 2009 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -23,6 +23,7 @@ * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors * 2882448 2009-10-21 blaschke-oss Add WBEMClientConstants from JSR48 + * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port */ package org.sblim.cimclient.internal.util; @@ -165,4 +166,9 @@ * Operating system name as found on z/OS */ public static final String Z_OS = "z/OS"; + + /** + * Exception message for indication sender potential DoS + */ + public static final String INDICATION_DOS_EXCEPTION_MESSAGE = "Indication sender taking too long, possible DoS underway?"; } Index: WBEMConfiguration.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -u -d -r1.30 -r1.30.2.1 --- WBEMConfiguration.java 15 Mar 2010 22:48:23 -0000 1.30 +++ WBEMConfiguration.java 21 Aug 2013 10:14:35 -0000 1.30.2.1 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2010 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -28,6 +28,7 @@ * 2846231 2009-09-23 rgummada connection failure on CIMOM w/o user/pw * 2930341 2010-01-12 blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0 * 2970881 2010-03-15 blaschke-oss Add property to control EmbeddedObject case + * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port */ package org.sblim.cimclient.internal.util; @@ -816,6 +817,28 @@ } /** + * Returns the http header timeout for indication connection handlers + * + * @return The timeout + */ + public int getListenerHttpHeaderTimeout() { + return Integer.parseInt(getProperty( + WBEMConfigurationProperties.LISTENER_HTTP_HEADER_TIMEOUT, + WBEMConfigurationDefaults.LISTENER_HTTP_HEADER_TIMEOUT)); + } + + /** + * Returns the maximum allowed http timeouts before IP is blocked + * + * @return The maximum allowed timeouts + */ + public int getListenerMaxAllowedTimeouts() { + return Integer.parseInt(getProperty( + WBEMConfigurationProperties.LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS, + WBEMConfigurationDefaults.LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS)); + } + + /** * Returns the maximal pool size for indication connection handlers * * @return The maximal pool size |
|
From: Dave B. <bla...@us...> - 2013-08-21 10:14:37
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7383/src/org/sblim/cimclient Modified Files: Tag: CIM_CLIENT_2_1_4_M WBEMListenerSBLIM.java WBEMConfigurationProperties.java Log Message: 2635 Slowloris DoS attack for CIM indication listener port Index: WBEMConfigurationProperties.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMConfigurationProperties.java,v retrieving revision 1.29.2.1 retrieving revision 1.29.2.2 diff -u -d -r1.29.2.1 -r1.29.2.2 --- WBEMConfigurationProperties.java 16 Mar 2010 01:01:46 -0000 1.29.2.1 +++ WBEMConfigurationProperties.java 21 Aug 2013 10:14:35 -0000 1.29.2.2 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2010 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -25,6 +25,7 @@ * 2930341 2010-01-12 blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0 * 2957387 2010-03-03 blaschke-oss EmbededObject XML attribute must not be all uppercases * 2970881 2010-03-15 blaschke-oss Add property to control EmbeddedObject case + * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port */ package org.sblim.cimclient; @@ -594,6 +595,38 @@ public static final String LISTENER_HTTP_TIMEOUT = "sblim.wbem.listenerHttpTimeout"; /** + * The header timeout for http connections of an indication listener. The + * header timeout is defined as the maximum amount of time allowed to read + * in the entire http header. A timeout of zero is interpreted as infinite + * timeout.<br /> + * <br /> + * Note: One form of DoS attack sends periodic http header lines in an + * attempt to keep the socket open indefinitely. This timeout can be used to + * thwart such an attempt.<br /> + * <br /> + * Type: <code>Integer</code><br/> + * Unit: <code>Milliseconds</code><br /> + * Recognition: <code>On next creation of a WBEMListener<code><br/> + * Range: <code>0 .. Integer.MAX_VALUE</code><br /> + * Default: <code>30000</code><br/> + */ + public static final String LISTENER_HTTP_HEADER_TIMEOUT = "sblim.wbem.listenerHttpHeaderTimeout"; + + /** + * The maximum allowable timeouts an http connection of an indication + * listener can have before the client ignores it. In other words, the + * number of times an IP exceeds sblim.wbem.listenerHttpTimeout and + * sblim.wbem.listenerHttpHeaderTimeout before it is blocked. A value of + * zero is interpreted as unlimited timeouts.<br /> + * <br /> + * Type: <code>Integer</code><br /> + * Recognition: <code>On next creation of a WBEMListener</code><br /> + * Range: <code>0 .. Integer.MAX_VALUE</code><br /> + * Default: <code>0</code><br /> + */ + public static final String LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS = "sblim.wbem.listenerHttpMaxAllowedTimeouts"; + + /** * The size of the thread pool for the connection handlers of the indicati * for http connections of an indication listener. This is the maximum * number of handler threads the pool might create on heavy load.<br /> Index: WBEMListenerSBLIM.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMListenerSBLIM.java,v retrieving revision 1.11 retrieving revision 1.11.8.1 diff -u -d -r1.11 -r1.11.8.1 --- WBEMListenerSBLIM.java 28 Apr 2009 19:42:45 -0000 1.11 +++ WBEMListenerSBLIM.java 21 Aug 2013 10:14:35 -0000 1.11.8.1 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2009 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -19,6 +19,7 @@ * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2) * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors + * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port */ package org.sblim.cimclient; @@ -55,6 +56,8 @@ private IndicationListener iIndicationListener; + private HttpConnectionHandler iConnectionHandler; + private HttpServerConnection iConnection; /** @@ -79,12 +82,14 @@ */ public WBEMListenerImpl(String pLocalAddress, int pPort, boolean pSSL, IndicationListener pIndicationListener, Properties pProperties) throws IOException { + WBEMConfiguration config = pProperties != null ? new WBEMConfiguration(pProperties) + : WBEMConfiguration.getGlobalConfiguration(); iIndicationListener = pIndicationListener; CIMEventDispatcher eventDispatcher = new CIMEventDispatcher(iIndicationListener); CIMIndicationHandler indicationHandler = new CIMIndicationHandler(eventDispatcher); - iConnection = new HttpServerConnection(new HttpConnectionHandler(indicationHandler), - pLocalAddress, pPort, pSSL, pProperties != null ? new WBEMConfiguration( - pProperties) : WBEMConfiguration.getGlobalConfiguration()); + this.iConnectionHandler = new HttpConnectionHandler(indicationHandler, config); + iConnection = new HttpServerConnection(this.iConnectionHandler, pLocalAddress, pPort, + pSSL, config); } @Override @@ -124,6 +129,25 @@ return this.iConnection.getPort(); } + /** + * Get the IPs blocked by the listener. + * + * @return The comma-separated list of blocked IPs. + */ + public String getBlockedIPs() { + return this.iConnectionHandler.getBlockedIPs(); + } + + /** + * Set the IPs to be blocked by the listener. + * + * @param pIPs + * The comma-separated list of blocked IPs. + */ + public void setBlockedIPs(String pIPs) { + this.iConnectionHandler.setBlockedIPs(pIPs); + } + } private final static WBEMListenerSBLIM INSTANCE = new WBEMListenerSBLIM(); @@ -208,10 +232,42 @@ return listener.getListenerPort(); } + /** + * Get the IPs blocked by the listener associated with the specified port. + * + * @param pPort + * The port. + * @return The comma-separated list of blocked IPs. + */ + public String getBlockedIPs(int pPort) { + if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new IllegalArgumentException( + "Port not in use."); } + WBEMListenerImpl listener = this.iPortMap.get(Integer.valueOf(pPort)); + return listener != null ? listener.getBlockedIPs() : null; + } + public synchronized void removeListener(int pPort) { WBEMListenerImpl listener = this.iPortMap.remove(new Integer(pPort)); if (listener != null) { listener.stop(); } } + + /** + * Set the IPs to be blocked by the listener associated with the specified + * port. + * + * @param pPort + * The port. + * @param pIPs + * The comma-separated list of blocked IPs. + */ + public void setBlockedIPs(int pPort, String pIPs) { + if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new IllegalArgumentException( + "Port not in use."); } + WBEMListenerImpl listener = this.iPortMap.get(Integer.valueOf(pPort)); + if (listener != null) { + listener.setBlockedIPs(pIPs); + } + } } |
|
From: Dave B. <bla...@us...> - 2013-08-21 00:39:16
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15208/src/org/sblim/cimclient/internal/http Modified Files: Tag: Experimental HttpConnectionHandler.java Log Message: 2657 Potential null pointer exception in handleConnection Index: HttpConnectionHandler.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/HttpConnectionHandler.java,v retrieving revision 1.4.2.8 retrieving revision 1.4.2.9 diff -u -d -r1.4.2.8 -r1.4.2.9 --- HttpConnectionHandler.java 20 May 2013 19:15:04 -0000 1.4.2.8 +++ HttpConnectionHandler.java 21 Aug 2013 00:39:14 -0000 1.4.2.9 @@ -25,6 +25,7 @@ * 3185818 2011-02-18 blaschke-oss indicationOccured URL incorrect * 3495662 2012-02-29 blaschke-oss Invalid HTML from HttpConnectionHandler.writeError * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port + * 2657 2013-08-20 blaschke-oss Potential null pointer exception in handleConnection */ package org.sblim.cimclient.internal.http; @@ -214,8 +215,8 @@ "Exception while reading from server socket", e); if (e instanceof SocketTimeoutException - || e.getMessage().equalsIgnoreCase( - WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE)) { + || WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE.equalsIgnoreCase(e + .getMessage())) { addSuspectIP(socket.getInetAddress().getHostAddress()); } } |
|
From: Dave H. <hel...@us...> - 2013-08-21 00:29:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via 3ba4a96248139309b191d34cefee83b1c2093708 (commit)
from b679d5586e75b1b0a3d328970a9853b6513d5ec8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3ba4a96248139309b191d34cefee83b1c2093708
Author: Dave Heller <hel...@us...>
Date: Tue Aug 20 20:11:28 2013 -0400
prep for 1.3.17 release
-----------------------------------------------------------------------
Summary of changes:
NEWS | 16 +++++++++++++---
configure.ac | 2 +-
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 9e7f7fa..781b6fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,22 @@
Changes in 1.3.17
-=================
-New features:
+================
+
+New features:
- 3597805 Restart HTTP daemon without restarting SFCB
- 3599160 Add sfcbproc utility
+- [sfcb-tix:#55] make install should not overwrite sfcb.cfg
Bugs fixed:
- 3599329 dlopen failed for sfcbCustomLib
-- sfcb-tix:#28 Further shm trace id leak
+- [sfcb-tix:#28] Further shm trace id leak
+- [sfcb-tix:#30] Make maxBindAttempts a configurable option
+- [sfcb-tix:#42] Run setupControl prior to getControl
+- [sfcb-tix:#45] HTTP verb check may fail producing 501 error
+- [sfcb-tix:#46] Error parsing CDATA with no whitespace
+- [sfcb-tix:#51] Malformed OP causes segfault
+- [sfcb-tix:#54] Fix for sfcbproc.c
+- [sfcb-tix:#68] reinitialize select timeout in SSL handshake
+- 3600125 Share client tracing shm segment
Changes in 1.3.16
=================
diff --git a/configure.ac b/configure.ac
index a38ea08..9a970b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(Small Footprint CIM Broker, 1.3.17-preview, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.3.17, sbl...@li..., sblim-sfcb)
AC_CONFIG_SRCDIR([providerDrv.c])
#disable "seems to ignore the --datarootdir setting" warnings
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-08-20 23:49:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via b679d5586e75b1b0a3d328970a9853b6513d5ec8 (commit)
from 6b1e4c5066a635fa941d054b054a8c3d40992a42 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b679d5586e75b1b0a3d328970a9853b6513d5ec8
Author: Dave Heller <hel...@us...>
Date: Tue Aug 20 19:48:59 2013 -0400
[ 3600125 ] Share client tracing shm segment
-----------------------------------------------------------------------
Summary of changes:
trace.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/trace.c b/trace.c
index 5da60cc..e165e57 100644
--- a/trace.c
+++ b/trace.c
@@ -53,7 +53,7 @@ unsigned long _sfcb_trace_mask = 0;
/* use pointer indirect _sfcb_trace_mask to allow shared memory flag */
unsigned long *_ptr_sfcb_trace_mask = &_sfcb_trace_mask;
void *vpDP = NULL;
-int shmid;
+int shmid=0;
char *_SFCB_TRACE_FILE = NULL;
int _SFCB_TRACE_TO_SYSLOG = 0;
@@ -122,7 +122,9 @@ void _sfcb_trace_init()
FILE *ferr = NULL;
int tryid = 0xDEB001;
- while ((shmid = shmget(tryid, sizeof(unsigned long), (IPC_EXCL | IPC_CREAT | 0660))) < 0 && (errno == EEXIST)) tryid++;
+ if (shmid == 0) {
+ while ((shmid = shmget(tryid, sizeof(unsigned long), (IPC_EXCL | IPC_CREAT | 0660))) < 0 && (errno == EEXIST)) tryid++;
+ }
mlogf(M_INFO,M_SHOW,"--- Shared memory ID for tracing: %x\n", tryid);
if (shmid < 0) {
mlogf(M_ERROR,M_SHOW, "shmget(%x) failed in %s at line %d.\n", tryid, __FILE__, __LINE__ );
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2013-08-20 23:42:39
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13188/src/org/sblim/cimclient Modified Files: Tag: Experimental WBEMConfigurationProperties.java Log Message: 2151 gzip compression not supported Index: WBEMConfigurationProperties.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMConfigurationProperties.java,v retrieving revision 1.17.2.42 retrieving revision 1.17.2.43 diff -u -d -r1.17.2.42 -r1.17.2.43 --- WBEMConfigurationProperties.java 29 Jul 2013 14:27:33 -0000 1.17.2.42 +++ WBEMConfigurationProperties.java 20 Aug 2013 23:42:34 -0000 1.17.2.43 @@ -49,6 +49,7 @@ * 2642 2013-05-21 blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers * 2647 2013-07-01 blaschke-oss Add two ssl protocol properties for http server and client * 2654 2013-07-29 blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF + * 2151 2013-08-20 blaschke-oss gzip compression not supported */ package org.sblim.cimclient; @@ -1080,4 +1081,22 @@ * </pre> */ public static final String SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES = "sblim.wbem.synchronizeNumericKeyDataTypes"; + + /** + * <pre> + * If set to true, gzip encoding is enabled. If set to false, gzip encoding + * is not enabled. When enabled, outgoing requests include the HTTP header + * "Accept-Encoding: gzip" to indicate to the CIMOM that the client handles + * message bodies compressed with gzip. If the incoming response includes + * "Content-Encoding: gzip" the message body will be decompressed with gzip + * before being processed. + * + * Note: This property does not affect indications or outgoing requests. + * + * Type: Boolean + * Recognition: Anytime + * Default: false + * </pre> + */ + public static final String ENABLE_GZIP_ENCODING = "sblim.wbem.enableGzipEncoding"; } |
|
From: Dave B. <bla...@us...> - 2013-08-20 12:30:38
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13474/src/org/sblim/cimclient/internal/wbem Modified Files: WBEMClientCIMXML.java Log Message: 2651 IOException when tracing the cimxml Index: WBEMClientCIMXML.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- WBEMClientCIMXML.java 9 Mar 2013 12:29:56 -0000 1.82 +++ WBEMClientCIMXML.java 20 Aug 2013 12:30:35 -0000 1.83 @@ -72,12 +72,12 @@ * 3601894 2013-01-23 blaschke-oss Enhance HTTP and CIM-XML tracing * 2614 2013-02-21 blaschke-oss Remove redundant code in transmitRequest * 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication() + * 2651 2013-07-31 blaschke-oss IOException when tracing the cimxml */ package org.sblim.cimclient.internal.wbem; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -163,8 +163,6 @@ private final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties()); - private FileOutputStream iCimXmlTraceFile = null; - private Locale[] iLocales; // final private HttpClientPool iHttpClientPool; // final @@ -255,27 +253,6 @@ throw new RuntimeException(e); } - if (this.iConfiguration.isCimXmlTracingEnabled() - && LogAndTraceBroker.getBroker().getXmlTraceStream() == null) { - String filename = this.iConfiguration.getCimXmlTraceStream(); - if (filename != null && filename.length() > 0) { - if (filename.equalsIgnoreCase("System.out")) { - LogAndTraceBroker.getBroker().setXmlTraceStream(System.out); - } else if (filename.equalsIgnoreCase("System.err")) { - LogAndTraceBroker.getBroker().setXmlTraceStream(System.err); - } else { - try { - this.iCimXmlTraceFile = new FileOutputStream(filename); - LogAndTraceBroker.getBroker().setXmlTraceStream(this.iCimXmlTraceFile); - } catch (IOException e) { - logger.trace(Level.FINE, "Unable to open " - + WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "=" - + filename, e); - } - } - } - } - this.iInitialized = true; } finally { @@ -629,11 +606,6 @@ if (this.iHttpClientPool != null) { this.iHttpClientPool.closePool(); } - if (this.iCimXmlTraceFile != null) { - this.iCimXmlTraceFile.close(); - } - } catch (IOException e) { - // Ignore CIM-XML trace file exception } finally { this.iClosed = true; logger.exit(); |
|
From: Dave B. <bla...@us...> - 2013-08-20 12:10:55
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12619/src/org/sblim/cimclient/internal/http Modified Files: HttpClient.java Log Message: 2654 Check jcc idle time with CIMOM keepalive timeout to avoid EOF Index: HttpClient.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/HttpClient.java,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- HttpClient.java 30 May 2013 13:10:35 -0000 1.48 +++ HttpClient.java 20 Aug 2013 12:10:53 -0000 1.49 @@ -71,6 +71,7 @@ * 2621 2013-02-23 blaschke-oss Not all chunked input has trailers * 2618 2013-02-27 blaschke-oss Need to add property to disable weak cipher suites for the secure indication * 2642 2013-05-21 blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers + * 2654 2013-07-29 blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF */ package org.sblim.cimclient.internal.http; @@ -551,6 +552,29 @@ logger.trace(Level.FINER, "Attempting http request (retry counters:" + IoRetry + "/" + AuthentificationRetry + ")"); long RequestTime = System.currentTimeMillis(); + + if (this.iPreviousResponseTime != -1) { + long time = RequestTime - this.iPreviousResponseTime; + long maxTime = this.iHttpClientPool.getConfigurationContext() + .getSocketIdleTimeout(); + if (maxTime > 0 && time > maxTime) { + logger.trace(Level.FINER, "Closing socket after " + time + + "ms of idle time"); + + if (this.iSocket != null && !this.iSocket.isClosed()) { + try { + this.iSocket.close(); + } catch (IOException e) { + logger.trace(Level.FINER, + "Exception caught while closing socket", e); + } + } + this.iSocket = null; + this.iReset = true; + this.iResponse = null; + } + } + ResponseTime = -1; resetSocket(); this.iReset = false; |
|
From: Dave B. <bla...@us...> - 2013-08-20 11:55:43
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11866 Modified Files: NEWS Log Message: 2653 FVT: java.lang.ExceptionInInitializerError during static init Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.361 retrieving revision 1.362 diff -u -d -r1.361 -r1.362 --- NEWS 20 Aug 2013 11:46:08 -0000 1.361 +++ NEWS 20 Aug 2013 11:55:40 -0000 1.362 @@ -1,5 +1,6 @@ Changes in HEAD ================ + 2653 FVT: java.lang.ExceptionInInitializerError during static init 2652 LogAndTraceBroker.setXmlTraceStream should not close previous stream 2650 SLP opaque value handling incorrect 2604 SAXException messages should contain node name |
|
From: Dave B. <bla...@us...> - 2013-08-20 11:55:42
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11866/src/org/sblim/cimclient/internal/util Modified Files: WBEMConfiguration.java Log Message: 2653 FVT: java.lang.ExceptionInInitializerError during static init Index: WBEMConfiguration.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- WBEMConfiguration.java 29 Jul 2013 15:02:18 -0000 1.52 +++ WBEMConfiguration.java 20 Aug 2013 11:55:40 -0000 1.53 @@ -50,6 +50,7 @@ * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port * 2642 2013-05-21 blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers * 2647 2013-07-01 blaschke-oss Add two ssl protocol properties for http server and client + * 2653 2013-07-26 blaschke-oss FVT: java.lang.ExceptionInInitializerError during static init */ package org.sblim.cimclient.internal.util; @@ -69,8 +70,6 @@ import javax.net.SocketFactory; import org.sblim.cimclient.WBEMConfigurationProperties; -import org.sblim.cimclient.internal.logging.LogAndTraceBroker; -import org.sblim.cimclient.internal.logging.Messages; /** * Class WBEMConfigurationFile is responsible for initializing the the @@ -123,12 +122,12 @@ } else if (key.startsWith("ssl.")) { String value = String.valueOf(entry.getValue()); Security.setProperty(key, value); - } else { - if (LogAndTraceBroker.isLoggingStarted()) { - LogAndTraceBroker.getBroker().message(Messages.INVALID_KEY_IN_CONFIG_FILE, - key); - } - } + } // else { LogAndTraceBroker is NOT initialized yet + // if (LogAndTraceBroker.isLoggingStarted()) { + // LogAndTraceBroker.getBroker().message(Messages.INVALID_KEY_IN_CONFIG_FILE, + // key); + // } + // } } } catch (IOException e) { cLoadException = e; |
|
From: Dave B. <bla...@us...> - 2013-08-20 11:46:11
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11523/src/org/sblim/cimclient/internal/logging Modified Files: LogAndTraceBroker.java Log Message: 2652 LogAndTraceBroker.setXmlTraceStream should not close previous stream Index: LogAndTraceBroker.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging/LogAndTraceBroker.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- LogAndTraceBroker.java 6 Feb 2013 13:05:46 -0000 1.28 +++ LogAndTraceBroker.java 20 Aug 2013 11:46:08 -0000 1.29 @@ -31,6 +31,7 @@ * 3554738 2012-08-16 blaschke-oss dump CIM xml by LogAndTraceBroker.trace() * 3576396 2012-10-11 blaschke-oss Improve logging of config file name * 3596303 2013-01-04 blaschke-oss windows http response WWW-Authenticate: Negotiate fails + * 2652 2013-07-26 blaschke-oss LogAndTraceBroker.setXmlTraceStream should not close previous stream */ package org.sblim.cimclient.internal.logging; @@ -734,14 +735,6 @@ * CIM-XML debugging is disabled. */ public void setXmlTraceStream(OutputStream pStream) { - if ((this.iXmlTraceStream != null) && (!this.iXmlTraceStream.equals(System.out)) - && (!this.iXmlTraceStream.equals(System.err))) { - try { - this.iXmlTraceStream.close(); - } catch (IOException e) { - // just ignore it - } - } this.iXmlTraceStream = pStream; } |
|
From: Dave B. <bla...@us...> - 2013-08-14 16:22:10
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9929/src/org/sblim/cimclient/internal/http Modified Files: Tag: Experimental MessageReader.java HttpClient.java Log Message: 2655 Content-length must be ignored when Transfer-encoding present Index: MessageReader.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/MessageReader.java,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -u -d -r1.4.2.6 -r1.4.2.7 --- MessageReader.java 16 May 2013 18:55:52 -0000 1.4.2.6 +++ MessageReader.java 14 Aug 2013 16:22:07 -0000 1.4.2.7 @@ -23,6 +23,7 @@ * 3601894 2013-01-23 blaschke-oss Enhance HTTP and CIM-XML tracing * 2621 2013-02-23 blaschke-oss Not all chunked input has trailers * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port + * 2655 2013-08-14 blaschke-oss Content-length must be ignored when Transfer-encoding present */ package org.sblim.cimclient.internal.http; @@ -66,21 +67,18 @@ this.iMethod = new HttpServerMethod(pStream); this.iHeader = new HttpHeader(pStream, pTimeout); - // TODO: Add support for chunked, and bounded input stream String encoding = this.iHeader.getField("Transfer-Encoding"); if ((encoding != null) && (encoding.toLowerCase().endsWith("chunked"))) { this.iChunked = true; } String length = this.iHeader.getField("Content-Length"); int contentLength = -1; - if (length != null) { + if (length != null && length.length() > 0) { try { contentLength = Integer.parseInt(length); } catch (Exception e) { - contentLength = -1; - - LogAndTraceBroker logger = LogAndTraceBroker.getBroker(); - logger.trace(Level.FINER, "Exception while parsing http content-length", e); + LogAndTraceBroker.getBroker().trace(Level.FINER, + "Exception while parsing http content-length", e); } } String contentType = this.iHeader.getField("Content-Type"); @@ -91,18 +89,18 @@ } catch (Exception e) { encoding = "UTF-8"; // TODO is this the default character // encoding? - LogAndTraceBroker logger = LogAndTraceBroker.getBroker(); - logger.trace(Level.FINER, "Exception while parsing http content-type", e); + LogAndTraceBroker.getBroker().trace(Level.FINER, + "Exception while parsing http content-type", e); } this.iEncoding = encoding; } + + this.iContent = new PersistentInputStream(pStream, isPersistentConnectionSupported()); if (this.iChunked) { - this.iContent = new ChunkedInputStream(new PersistentInputStream(pStream, - isPersistentConnectionSupported()), this.iHeader.getField("Trailer"), + this.iContent = new ChunkedInputStream(this.iContent, this.iHeader.getField("Trailer"), "Indication Request"); - } else { - this.iContent = new BoundedInputStream(new PersistentInputStream(pStream, - isPersistentConnectionSupported()), contentLength); + } else if (contentLength >= 0) { + this.iContent = new BoundedInputStream(this.iContent, contentLength); } } Index: HttpClient.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/HttpClient.java,v retrieving revision 1.12.2.38 retrieving revision 1.12.2.39 diff -u -d -r1.12.2.38 -r1.12.2.39 --- HttpClient.java 29 Jul 2013 14:27:33 -0000 1.12.2.38 +++ HttpClient.java 14 Aug 2013 16:22:08 -0000 1.12.2.39 @@ -72,6 +72,7 @@ * 2618 2013-02-27 blaschke-oss Need to add property to disable weak cipher suites for the secure indication * 2642 2013-05-21 blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers * 2654 2013-07-29 blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF + * 2655 2013-08-14 blaschke-oss Content-length must be ignored when Transfer-encoding present */ package org.sblim.cimclient.internal.http; @@ -744,14 +745,17 @@ String transferEncoding = this.iResponseHeaders .getField("Transfer-encoding"); - - if (transferEncoding != null - && transferEncoding.toLowerCase().endsWith("chunked")) { - this.iServerInput = new ChunkedInputStream(this.iServerInput, - this.iResponseHeaders.getField("Trailer"), "Response"); - this.iKeepAlive = true; + if (transferEncoding != null) { + length = -1; // ignore Content-length + if (transferEncoding.toLowerCase().endsWith("chunked")) { + this.iServerInput = new ChunkedInputStream(this.iServerInput, + this.iResponseHeaders.getField("Trailer"), "Response"); + this.iKeepAlive = true; + } } - this.iServerInput = new BoundedInputStream(this.iServerInput, length); + + if (length >= 0) this.iServerInput = new BoundedInputStream( + this.iServerInput, length); logger.trace(Level.FINER, "KeepAlive=" + (this.iKeepAlive ? "true" : "false")); |
|
From: Dave H. <hel...@us...> - 2013-08-07 05:31:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via 6b1e4c5066a635fa941d054b054a8c3d40992a42 (commit)
from cfcec8fefd2686b4c8e295821ac122655cf5adeb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6b1e4c5066a635fa941d054b054a8c3d40992a42
Author: Dave Heller <hel...@us...>
Date: Wed Aug 7 01:31:11 2013 -0400
[sfcb-tix:#68] reinitialize select timeout in SSL handshake
-----------------------------------------------------------------------
Summary of changes:
httpAdapter.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/httpAdapter.c b/httpAdapter.c
index cbceba2..98b6757 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -688,6 +688,8 @@ static ChunkFunctions httpChunkFunctions = {
#define hdrBufsize 5000
#define hdrLimmit 5000
+#define TV_TO_MS(x) ( (int) x.tv_sec * 1000 + (int) x.tv_usec / 1000 )
+
static int getHdrs(CommHndl conn_fd, Buffer * b, char *cmd)
{
int checked=0,total=0,isReady;
@@ -1266,6 +1268,8 @@ static void handleHttpRequest(int connFd, int sslMode)
intSSLerror("Error creating SSL object");
SSL_set_bio(conn_fd.ssl, sb, sb);
char *error_string;
+ httpSelectTimeout.tv_sec = selectTimeout;
+ httpSelectTimeout.tv_usec = 0;
while(1) {
int sslacc, sslerr;
sslacc = SSL_accept(conn_fd.ssl);
@@ -1282,13 +1286,13 @@ static void handleHttpRequest(int connFd, int sslMode)
FD_SET(connFd,&httpfds);
if (sslerr == SSL_ERROR_WANT_WRITE) {
_SFCB_TRACE(2, (
- "--- Waiting for SSL handshake (WANT_WRITE): timeout=%ld",
- httpSelectTimeout.tv_sec));
+ "--- Waiting for SSL handshake (WANT_WRITE): timeout=%lums",
+ TV_TO_MS(httpSelectTimeout)));
isReady = select(connFd+1,NULL,&httpfds,NULL,&httpSelectTimeout);
} else {
_SFCB_TRACE(2, (
- "--- Waiting for SSL handshake (WANT_READ): timeout=%ld",
- httpSelectTimeout.tv_sec));
+ "--- Waiting for SSL handshake (WANT_READ): timeout=%lums",
+ TV_TO_MS(httpSelectTimeout)));
isReady = select(connFd+1,&httpfds,NULL,NULL,&httpSelectTimeout);
}
if (isReady == 0) {
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-08-07 04:54:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 4bf9669dae5b3e0e6a047afc93e0cdfd20a33ffd (commit)
from 2f234a060bbdae2fe9d12770018f113ef5b1466d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4bf9669dae5b3e0e6a047afc93e0cdfd20a33ffd
Author: Dave Heller <hel...@us...>
Date: Wed Aug 7 00:49:24 2013 -0400
[sfcb-tix:#68] reinitialize select timeout in SSL handshake
-----------------------------------------------------------------------
Summary of changes:
httpAdapter.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/httpAdapter.c b/httpAdapter.c
index 950905e..66b84d7 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -1523,6 +1523,8 @@ handleHttpRequest(int connFd, int __attribute__ ((unused)) sslMode)
intSSLerror("Error creating SSL object");
SSL_set_bio(conn_fd.ssl, sb, sb);
char *error_string;
+ httpSelectTimeout.tv_sec = selectTimeout;
+ httpSelectTimeout.tv_usec = 0;
while (1) {
int sslacc,
sslerr;
@@ -1544,15 +1546,15 @@ handleHttpRequest(int connFd, int __attribute__ ((unused)) sslMode)
FD_SET(connFd, &httpfds);
if (sslerr == SSL_ERROR_WANT_WRITE) {
_SFCB_TRACE(2, (
- "--- Waiting for SSL handshake (WANT_WRITE): timeout=%ld",
- httpSelectTimeout.tv_sec));
+ "--- Waiting for SSL handshake (WANT_WRITE): timeout=%lums",
+ TV_TO_MS(httpSelectTimeout)));
isReady =
select(connFd + 1, NULL, &httpfds, NULL,
&httpSelectTimeout);
} else {
_SFCB_TRACE(2, (
- "--- Waiting for SSL handshake (WANT_READ): timeout=%ld",
- httpSelectTimeout.tv_sec));
+ "--- Waiting for SSL handshake (WANT_READ): timeout=%lums",
+ TV_TO_MS(httpSelectTimeout)));
isReady =
select(connFd + 1, &httpfds, NULL, NULL,
&httpSelectTimeout);
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
