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 H. <hel...@us...> - 2013-06-28 19:17:08
|
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 3001ff9bc963f6d71353c474102de43306e0a1cb (commit)
from 5ac8bd5daef08f1763c0b2fcbbbb3dc87609f0cf (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 3001ff9bc963f6d71353c474102de43306e0a1cb
Author: Dave Heller <hel...@us...>
Date: Fri Jun 28 15:16:05 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 d7efa69..3f8266c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Changes in 1.4.6
+================
+
+New features:
+
+Bugs fixed:
+
+
Changes in 1.4.5
================
diff --git a/configure.ac b/configure.ac
index 3396452..ee96ad8 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.4.5, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.4.6-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-06-28 19:05:52
|
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_4_5 has been created
at 5ac8bd5daef08f1763c0b2fcbbbb3dc87609f0cf (commit)
- Log -----------------------------------------------------------------
commit 5ac8bd5daef08f1763c0b2fcbbbb3dc87609f0cf
Author: Dave Heller <hel...@us...>
Date: Fri Jun 28 14:59:32 2013 -0400
prepping for 1.4.5 release
-----------------------------------------------------------------------
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-06-28 19:04:33
|
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 5ac8bd5daef08f1763c0b2fcbbbb3dc87609f0cf (commit)
from ffece1fc94b2dab4370ed6a37053809be99c2fbc (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 5ac8bd5daef08f1763c0b2fcbbbb3dc87609f0cf
Author: Dave Heller <hel...@us...>
Date: Fri Jun 28 14:59:32 2013 -0400
prepping for 1.4.5 release
-----------------------------------------------------------------------
Summary of changes:
NEWS | 24 +++++++++++++++++++++++-
configure.ac | 2 +-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index dc7c36d..d7efa69 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,31 @@ Changes in 1.4.5
================
New features:
+- [sfcb-tix:#44] Escape XML for Embedded Instances Instead of Using CDATA
+- [sfcb-tix:#48] mofc: Allow absoltute paths in #pragma include
+- [sfcb-tix:#52] ABT core check
+- [sfcb-tix:#55] make install should not overwrite sfcb.cfg
+- [sfcb-tix:#59] Improve httpAdapter error handling
Bugs fixed:
-
+- [sfcb-tix:#31] TestAssociationProvider can cause some queries to fail
+- [sfcb-tix:#32] Provider Mgr trace should id the provider being called
+- [sfcb-tix:#36] Add Pulled Enums test provider
+- [sfcb-tix:#38] providerRegister:locateProvider() is unused
+- [sfcb-tix:#40] Add valgrind test (implemented only for the "none" init script at this time)
+- [sfcb-tix:#41] Global IndicationService
+- [sfcb-tix:#46] Error parsing CDATA with no whitespace
+- [sfcb-tix:#47] Pulled Enumeration support - CIMXML parser
+- [sfcb-tix:#37] indCIMXmlHandler coredumps in IndCIMXMLHandlerInvokeMethod
+- [sfbb-tix:#51] Malformed OP causes segfault
+- [sfcb-tix:#49] Cannot return EmbeddedInstance property from provider
+- [sfcb-tix:#53] SFCB may not start if runtime does not support IPv6
+- [sfcb-tix:#54] Fix for sfcbproc.c
+- [sfcb-tix:#18] disable default properties breaks test. Modified failing tests, also made test case insensitive and fixed result file naming.
+- [sfcb-tix:#56] Intermittent segfault at shutdown Relocate trace_stop due to timing issue on shmdt() call
+- [sfcb-tix:#12] Support HTTP Expect: 100-continue header
+- [sfcb-tix:#11] Remove unnecessary casts for allocs
+- [sfcb-tix:#58] sfcbdump test fails. Remove local test classSchemas file and use installed one instead.
Changes in 1.4.4
================
diff --git a/configure.ac b/configure.ac
index 056d5c5..3396452 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.4.5-preview, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.4.5, 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-06-27 04:31:08
|
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 ffece1fc94b2dab4370ed6a37053809be99c2fbc (commit)
from 09017b9e944a7d5c8387dc92c4bc96ac14436382 (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 ffece1fc94b2dab4370ed6a37053809be99c2fbc
Author: Dave Heller <hel...@us...>
Date: Thu Jun 27 00:30:42 2013 -0400
[sfcb-tix:#11] replace an inadvertently removed cast
-----------------------------------------------------------------------
Summary of changes:
providerRegister.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/providerRegister.c b/providerRegister.c
index 1ad0904..9930046 100644
--- a/providerRegister.c
+++ b/providerRegister.c
@@ -159,7 +159,7 @@ newProviderRegister()
struct passwd *passwd;
ProviderRegister *br = malloc(sizeof(*br) + sizeof(ProviderBase));
- ProviderBase *bb = (br + 1);
+ ProviderBase *bb = (ProviderBase *) (br + 1);
setupControl(configfile);
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-06-20 05:47:53
|
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 09017b9e944a7d5c8387dc92c4bc96ac14436382 (commit)
from d289e9570f2d33545af9b3b273d858623111b077 (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 09017b9e944a7d5c8387dc92c4bc96ac14436382
Author: Dave Heller <hel...@us...>
Date: Thu Jun 20 01:46:29 2013 -0400
[sfcb-tix:#59] Improve httpAdapter error handling
-----------------------------------------------------------------------
Summary of changes:
httpAdapter.c | 294 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 193 insertions(+), 101 deletions(-)
diff --git a/httpAdapter.c b/httpAdapter.c
index bc63490..d1ddea3 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -72,9 +72,10 @@
#include <grp.h>
#endif
-/* should go into cimRequest.h */
-#define REQ_STDHTTP 0
-#define REQ_REST 1
+/* should probably go into cimRequest.h */
+#define CIM_PROTOCOL_ANY 0
+#define CIM_PROTOCOL_CIM_XML 1
+#define CIM_PROTOCOL_CIM_RS 2
unsigned long exFlags = 0;
static char *name;
@@ -122,6 +123,24 @@ static void print_cert(const char *cert_file, const STACK_OF(X509_NAME) *);
#define AUTH_SERVTEMP -2
#define AUTH_SERVPERM -3
+/* return codes for HTTP operations. */
+enum {
+ HTTP_ERROR_NOERROR,
+ HTTP_ERROR_BADVERB,
+ HTTP_ERROR_BADVERSION,
+ HTTP_ERROR_DOS_ATTACK,
+ HTTP_ERROR_CLIENT_ABORT_HDR,
+ HTTP_ERROR_CLIENT_ABORT_REQ,
+ HTTP_ERROR_TIMEOUT_HDR,
+ HTTP_ERROR_TIMEOUT_REQ,
+ HTTP_ERROR_READCOUNT_EXCEED_HDR,
+ HTTP_ERROR_READCOUNT_EXCEED_REQ,
+ HTTP_ERROR_LENGTH_EXCEED_HDR,
+ HTTP_ERROR_LENGTH_EXCEED_REQ,
+ HTTP_ERROR_READERROR,
+ HTTP_ERROR_LAST /* never use, keep last */
+};
+
static key_t httpProcSemKey;
static key_t httpWorkSemKey;
static int httpProcSem;
@@ -180,7 +199,9 @@ typedef struct _buffer {
*content;
unsigned int length,
size,
- ptr;
+ ptr,
+ read_count;
+ unsigned long wait_time;
unsigned int header_length;
unsigned int content_length;
int trailers;
@@ -203,6 +224,8 @@ extern int fallback_ipv4;
#define SET_HDR_CP(member, val) member = val + strspn(val, " \t"); \
+#define TERMINATE(x) { if (!doFork) _SFCB_RETURN(x); commClose(conn_fd); exit(x); }
+
void
initHttpProcCtl(int p)
{
@@ -386,10 +409,8 @@ static void handleSigPipe(int __attribute__ ((unused)) sig)
static void
freeBuffer(Buffer * b)
{
- Buffer emptyBuf =
- { NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL
- };
+ Buffer emptyBuf = { NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL };
if (b->data)
free(b->data);
if (b->content)
@@ -426,7 +447,7 @@ add2buffer(Buffer * b, char *str, size_t len)
if (b->size == 0) {
b->size = len + 500;
b->length = 0;
- b->data = (char *) malloc(b->size);
+ b->data = malloc(b->size);
} else if (b->length + len >= b->size) {
b->size = b->length + len + 500;
b->data = realloc((void *) b->data, b->size);
@@ -768,26 +789,68 @@ static ChunkFunctions httpChunkFunctions = {
writeChunkResponse,
};
+static int
+chkHttpVerb (char *pVerb, int pProtocol) {
+
+ int i;
+
+ typedef struct {
+ char *verb;
+ int protocol;
+ } httpVerb;
+
+ /* Enable verbs by protocol by adding to this list */
+ httpVerb vList[] = {
+ { "POST", CIM_PROTOCOL_CIM_XML },
+// { "M-POST", CIM_PROTOCOL_CIM_XML },
+// { "POST", CIM_PROTOCOL_CIM_RS },
+// { "PUT", CIM_PROTOCOL_CIM_RS },
+// { "GET", CIM_PROTOCOL_CIM_RS },
+// { "DELETE", CIM_PROTOCOL_CIM_RS },
+ { NULL, CIM_PROTOCOL_ANY },
+ };
+
+ for (i=0; vList[i].verb; i++) {
+ if (!strncasecmp(pVerb, vList[i].verb, strlen(vList[i].verb))
+ && (pProtocol ? pProtocol == vList[i].protocol : 1)) {
+ return 1;
+ }
+ }
+ return 0;
+}
+
#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)
+getHdrs(CommHndl conn_fd, Buffer * b, int to)
{
int total = 0,
isReady;
fd_set httpfds;
- int state = 0;
+ int state = HTTP_ERROR_NOERROR;
+ int vChecked = 0;
+ unsigned int pass = 1;
+ struct timeval initialTV = { 0, 0 },
+ currentTV,
+ cumTV;
FD_ZERO(&httpfds);
FD_SET(conn_fd.socket, &httpfds);
- for (;;) {
- isReady =
- select(conn_fd.socket + 1, &httpfds, NULL, NULL,
- &httpSelectTimeout);
- if (isReady == 0)
- return 3;
+ initialTV.tv_sec = to;
+ currentTV = initialTV;
+
+ for (;; pass++) {
+ isReady = select(conn_fd.socket + 1, &httpfds, NULL, NULL, ¤tTV);
+
+ if (isReady == 0) {
+ mlogf(M_ERROR, M_SHOW, "-#- timeout waiting for HTTP headers\n");
+ state = HTTP_ERROR_TIMEOUT_HDR;
+ break;
+ }
char buf[hdrBufsize];
int r = commRead(conn_fd, buf, sizeof(buf));
@@ -798,39 +861,32 @@ getHdrs(CommHndl conn_fd, Buffer * b)
} else {
mlogf(M_INFO, M_SHOW, "--- getHdrs: read() error %s\n",
strerror(errno));
- state = 3;
+ state = HTTP_ERROR_READERROR;
break;
}
}
if (r == 0) {
- if (b->size == 0)
- break;
- if (strstr(b->data, "\r\n\r\n") == NULL &&
- strstr(b->data, "\n\n") == NULL) {
- mlogf(M_ERROR, M_SHOW, "-#- HTTP header ended prematurely\n");
- state = 3;
+ if (b->size == 0) {
+ state = HTTP_ERROR_NOERROR;
break;
}
+ mlogf(M_ERROR, M_SHOW, "-#- HTTP header ended prematurely\n");
+ state = HTTP_ERROR_CLIENT_ABORT_HDR;
+ break;
}
add2buffer(b, buf, r);
total += r;
- /* DO THIS IN THE ReqHandler
- * on first run through, ensure that this is a POST req. if cimxml req
- */
-// if (first)
-// fprintf(stderr, "buf is '%s', cmd is '%s'\n", buf, cmd);
-// if (r && first) {
-// if (strncasecmp(buf, cmd, strlen(cmd)) != 0) {
-// /*
-// * not what we expected - still continue to read to not confuse
-// * the client
-// */
-// state = 1;
-// }
-// first = 0;
-// }
+ if (!vChecked && strstr(b->data, "\n")) {
+ if (chkHttpVerb(b->data, CIM_PROTOCOL_CIM_XML)) {
+ vChecked=1;
+ }
+ else {
+ state = HTTP_ERROR_BADVERB;
+ break;
+ }
+ }
/*
* success condition: end of header
@@ -844,12 +900,15 @@ getHdrs(CommHndl conn_fd, Buffer * b)
break;
}
- if (total >= hdrLimmit) {
- mlogf(M_ERROR, M_SHOW, "-#- Possible DOS attempt detected\n");
- state = 2;
+ if (total >= hdrLimmit) { /* may indicate DOS attack */
+ mlogf(M_ERROR, M_SHOW, "-#- HTTP header length exceeded\n");
+ state = HTTP_ERROR_LENGTH_EXCEED_HDR;
break;
}
}
+ timersub(&initialTV, ¤tTV, &cumTV);
+ b->wait_time = (unsigned long) TV_TO_MS(cumTV);
+ b->read_count = pass;
return state;
}
@@ -891,11 +950,48 @@ pauseCodec(char *name)
return 0;
}
+/* Human readable error codes, for trace only */
+_SFCB_TRACE_VAR(
+static char *error_str(int rc)
+{
+ switch (rc) {
+ case HTTP_ERROR_NOERROR:
+ return "HTTP_ERROR_NOERROR";
+ case HTTP_ERROR_BADVERB:
+ return "HTTP_ERROR_BADVERB";
+ case HTTP_ERROR_BADVERSION:
+ return "HTTP_ERROR_BADVERSION";
+ case HTTP_ERROR_DOS_ATTACK:
+ return "HTTP_ERROR_DOS_ATTACK";
+ case HTTP_ERROR_CLIENT_ABORT_HDR:
+ return "HTTP_ERROR_CLIENT_ABORT_HDR";
+ case HTTP_ERROR_CLIENT_ABORT_REQ:
+ return "HTTP_ERROR_CLIENT_ABORT_REQ";
+ case HTTP_ERROR_TIMEOUT_HDR:
+ return "HTTP_ERROR_TIMEOUT_HDR";
+ case HTTP_ERROR_TIMEOUT_REQ:
+ return "HTTP_ERROR_TIMEOUT_REQ";
+ case HTTP_ERROR_READCOUNT_EXCEED_HDR:
+ return "HTTP_ERROR_READCOUNT_EXCEED_HDR";
+ case HTTP_ERROR_READCOUNT_EXCEED_REQ:
+ return "HTTP_ERROR_READCOUNT_EXCEED_REQ";
+ case HTTP_ERROR_LENGTH_EXCEED_HDR:
+ return "HTTP_ERROR_LENGTH_EXCEED_HDR";
+ case HTTP_ERROR_LENGTH_EXCEED_REQ:
+ return "HTTP_ERROR_LENGTH_EXCEED_REQ";
+ case HTTP_ERROR_READERROR:
+ return "HTTP_ERROR_READERROR";
+ }
+ return "HTTP_ERROR_INVALID";
+}
+)
+
static int
doHttpRequest(CommHndl conn_fd)
{
char *cp;
- Buffer inBuf = { NULL, NULL, 0, 0, 0, 0, 0, 0 };
+ Buffer inBuf = { NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL };
RespSegments response;
static RespSegments nullResponse = { NULL, 0, 0, NULL, {{0, NULL}} };
unsigned long len;
@@ -932,26 +1028,33 @@ doHttpRequest(CommHndl conn_fd)
inBuf.useragent = "";
int badReq = 0;
- /* get everything */
- rc = getHdrs(conn_fd, &inBuf);
+ /*
+ * read the entire header block, and some or all of the payload
+ */
+ rc = getHdrs(conn_fd, &inBuf, selectTimeout);
+ _SFCB_TRACE(2, ("get HTTP hdrs in %lums (%lu%% of timeout) in %u passes (%s)",
+ inBuf.wait_time, (inBuf.wait_time / selectTimeout / 10), inBuf.read_count,
+ error_str(rc)));
- if (rc == 1) { /* 1 indicates bad HTTP verb. may no longer be needed */
+ if (rc == HTTP_ERROR_BADVERB) {
+ _SFCB_TRACE(1, ("--- bad HTTP verb"));
genError(conn_fd, &inBuf, 501, "Not Implemented", NULL);
- /*
- * we continue to parse headers and empty the socket to be graceful
- * with the client
- */
- discardInput = 1;
- } else if (rc == 2) {
+ TERMINATE(1);
+ }
+ else if (rc == HTTP_ERROR_LENGTH_EXCEED_HDR) {
+ _SFCB_TRACE(1, ("--- HTTP header length exceeded"));
genError(conn_fd, &inBuf, 400, "Bad Request", NULL);
- discardInput = 2;
- _SFCB_TRACE(1, ("--- potential DOS attempt discovered."));
- } else if (rc == 3) {
+ TERMINATE(1);
+ }
+ else if (rc == HTTP_ERROR_CLIENT_ABORT_HDR) {
+ _SFCB_TRACE(1, ("--- client aborted prior to EOH"));
genError(conn_fd, &inBuf, 400, "Bad Request", NULL);
- _SFCB_TRACE(1, ("--- exiting after request timeout."));
- if (!doFork) _SFCB_RETURN(1);
- commClose(conn_fd);
- exit(1);
+ TERMINATE(1);
+ }
+ else if (rc == HTTP_ERROR_TIMEOUT_HDR) {
+ _SFCB_TRACE(1, ("--- timeout waiting for EOH"));
+ genError(conn_fd, &inBuf, 400, "Bad Request", NULL);
+ TERMINATE(1);
}
if (inBuf.size == 0) {
@@ -991,11 +1094,9 @@ doHttpRequest(CommHndl conn_fd)
}
if (badReq) {
- genError(conn_fd, &inBuf, 400, "Bad Request", NULL);
_SFCB_TRACE(1, ("--- exiting after malformed header."));
- if (!doFork) _SFCB_RETURN(1);
- commClose(conn_fd);
- exit(1);
+ genError(conn_fd, &inBuf, 400, "Bad Request", NULL);
+ TERMINATE(1);
}
/* parse rest of headers */
@@ -1003,65 +1104,62 @@ doHttpRequest(CommHndl conn_fd)
_SFCB_TRACE(1, ("--- Header: %s", hdr));
if (hdr[0] == 0)
break;
- else if (strncasecmp(hdr, "Authorization:", 14) == 0) {
+
+ if (strncasecmp(hdr, "Authorization:", 14) == 0) {
SET_HDR_CP(inBuf.authorization, &hdr[14]);
- } else if (strncasecmp(hdr, "Content-Length:", 15) == 0) {
+ }
+ else if (strncasecmp(hdr, "Content-Length:", 15) == 0) {
cp = &hdr[15];
cp += strspn(cp, " \t");
if (cp[0] == '-') {
- genError(conn_fd, &inBuf, 400, "Negative Content-Length", NULL);
_SFCB_TRACE(1, ("--- exiting: content-length too big"));
- if (!doFork) _SFCB_RETURN(1);
- commClose(conn_fd);
- exit(1);
+ genError(conn_fd, &inBuf, 400, "Negative Content-Length", NULL);
+ TERMINATE(1);
}
errno = 0;
unsigned long clen = strtoul(cp, NULL, 10);
if (errno != 0) {
+ _SFCB_TRACE(1, ("--- exiting: content-length conversion error"));
genError(conn_fd, &inBuf, 400,
"Error converting Content-Length to a decimal value",
NULL);
- _SFCB_TRACE(1, ("--- exiting: content-length conversion error"));
- if (!doFork) _SFCB_RETURN(1);
- commClose(conn_fd);
- exit(1);
+ TERMINATE(1);
}
unsigned int maxLen;
if ((getControlUNum("httpMaxContentLength", &maxLen) != 0) || maxLen == 0) {
+ _SFCB_TRACE(1, ("--- exiting: bad config httpMaxContentLength"));
genError(conn_fd, &inBuf, 501,
"Server misconfigured (httpMaxContentLength)", NULL);
- _SFCB_TRACE(1, ("--- exiting: bad config httpMaxContentLength"));
- if (!doFork) _SFCB_RETURN(1);
- commClose(conn_fd);
- exit(1);
+ TERMINATE(1);
}
if ((clen >= UINT_MAX) || ((maxLen) && (clen > maxLen))) {
- genError(conn_fd, &inBuf, 413, "Request Entity Too Large", NULL);
_SFCB_TRACE(1, ("--- exiting: content-length too big"));
- if (!doFork) _SFCB_RETURN(1);
- commClose(conn_fd);
- exit(1);
+ genError(conn_fd, &inBuf, 413, "Request Entity Too Large", NULL);
+ TERMINATE(1);
}
inBuf.content_length = clen;
- } else if (strncasecmp(hdr, "Content-Type:", 13) == 0) {
+ }
+ else if (strncasecmp(hdr, "Content-Type:", 13) == 0) {
SET_HDR_CP(inBuf.content_type, &hdr[13]);
- } else if (strncasecmp(hdr, "Host:", 5) == 0) {
+ }
+ else if (strncasecmp(hdr, "Host:", 5) == 0) {
SET_HDR_CP(inBuf.host, &hdr[5]);
-
if (strchr(inBuf.host, '/') != NULL || inBuf.host[0] == '.') {
- if (!discardInput) {
- genError(conn_fd, &inBuf, 400, "Bad Request", NULL);
- discardInput = 2;
- }
+ _SFCB_TRACE(1, ("--- exiting: bad HTTP host"));
+ genError(conn_fd, &inBuf, 400, "Bad Request", NULL);
+ TERMINATE(1);
}
- } else if (strncasecmp(hdr, "User-Agent:", 11) == 0) {
+ }
+ else if (strncasecmp(hdr, "User-Agent:", 11) == 0) {
SET_HDR_CP(inBuf.useragent, &hdr[11]);
- } else if (strncasecmp(hdr, "TE:", 3) == 0) {
+ }
+ else if (strncasecmp(hdr, "TE:", 3) == 0) {
char *cp = &hdr[3];
cp += strspn(cp, " \t");
if (strncasecmp(cp, "trailers", 8) == 0)
inBuf.trailers = 1;
- } else if (!discardInput && !strncasecmp(hdr, "Expect:", 7)) {
+ }
+ else if (strncasecmp(hdr, "Expect:", 7) == 0) {
if (!strncasecmp(inBuf.protocol, "HTTP/1.1", 8) &&
!strncasecmp(hdr+8 + strspn(hdr+8, " \t"), "100-continue", 12)) {
// Send the reply only if we have not yet received any of the payload
@@ -1069,7 +1167,7 @@ doHttpRequest(CommHndl conn_fd)
write100ContResponse(conn_fd);
} else {
genError(conn_fd, &inBuf, 417, "Expectation Failed", NULL);
- discardInput = 2;
+ TERMINATE(1);
}
}
#ifdef ALLOW_UPDATE_EXPIRED_PW
@@ -1095,9 +1193,7 @@ doHttpRequest(CommHndl conn_fd)
*/
mlogf(M_ERROR, M_SHOW,
"\n--- Client certificate not accessible - closing connection\n");
- if (!doFork) _SFCB_RETURN(1);
- commClose(conn_fd);
- exit(1);
+ TERMINATE(1);
}
}
}
@@ -1206,9 +1302,7 @@ doHttpRequest(CommHndl conn_fd)
free(more);
more=NULL;
}
- if (!doFork) _SFCB_RETURN(1);
- commClose(conn_fd);
- exit(1);
+ TERMINATE(1);
}
hdr = malloc(strlen(inBuf.authorization) + 64);
@@ -1224,9 +1318,7 @@ doHttpRequest(CommHndl conn_fd)
free(more);
more=NULL;
}
- if (!doFork) _SFCB_RETURN(1);
- commClose(conn_fd);
- exit(1);
+ TERMINATE(1);
}
if (discardInput) {
releaseAuthHandle();
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2013-06-13 17:27:23
|
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 d289e9570f2d33545af9b3b273d858623111b077 (commit)
from edab714206fc3293e5f180886c7768221b6076fe (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 d289e9570f2d33545af9b3b273d858623111b077
Author: Michael Chase-Salerno <br...@li...>
Date: Thu Jun 13 13:26:04 2013 -0400
[sfcb-tix:#58] sfcbdump test fails
Remove local test classSchemas file and use installed one instead.
-----------------------------------------------------------------------
Summary of changes:
test/commands/Makefile.am | 2 ++
test/commands/classSchemas | Bin 590668 -> 0 bytes
test/commands/sfcbdump.sh | 2 +-
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/test/commands/Makefile.am b/test/commands/Makefile.am
index 6b8e972..5cdee18 100644
--- a/test/commands/Makefile.am
+++ b/test/commands/Makefile.am
@@ -24,4 +24,6 @@ MAINTAINERCLEANFILES = Makefile.in
#Some wbemcat tests
export SRCDIR=$(srcdir)
+export SFCB_REPODIR=$(localstatedir)/lib/sfcb/registration/repository/
+
TESTS = cmdusage.sh sfcbdump.sh
diff --git a/test/commands/classSchemas b/test/commands/classSchemas
deleted file mode 100644
index 180ee3b..0000000
Binary files a/test/commands/classSchemas and /dev/null differ
diff --git a/test/commands/sfcbdump.sh b/test/commands/sfcbdump.sh
index 59d7c38..b0f8312 100755
--- a/test/commands/sfcbdump.sh
+++ b/test/commands/sfcbdump.sh
@@ -1,6 +1,6 @@
#!/bin/sh
RC=0
-if ! sfcbdump $SRCDIR/classSchemas | grep Linux_CSProcessor > /dev/null
+if ! sfcbdump ${SFCB_REPODIR}/root/cimv2/classSchemas | grep Linux_CSProcessor > /dev/null
then
RC=1
fi
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-06-11 23:49:52
|
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 "cmpi-base - Base OS CMPI Providers".
The branch, master has been updated
via e37b7403daad73ae928be1915f53fa6178f25e9d (commit)
from aa228b9cfa96962488afffb662064db0f72b5f84 (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 e37b7403daad73ae928be1915f53fa6178f25e9d
Author: Dave Heller <hel...@us...>
Date: Tue Jun 11 19:42:23 2013 -0400
Fixed SBLIM-2644: wrong UserModeTime and KernelModeTime
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
NEWS | 1 +
OSBase_UnixProcess.c | 6 +++---
contributions.txt | 1 +
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 319921a..f86db38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-11 Dave Heller <hel...@us...>
+
+ * NEWS, contributions.txt, OSBase_UnixProcess.c:
+
+ Fixed SBLIM-2644: wrong UserModeTime and KernelModeTime
+ (patch by Henning Sackewitz)
+
2013-05-28 Dave Heller <hel...@us...>
* NEWS, contributions.txt, OSBase_Processor.c:
diff --git a/NEWS b/NEWS
index dc4e3cd..84680d1 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes in Version 1.6.3
Bugs Fixed:
- SBLIM-2634: incorrect max cpu frequency
+- SBLIM-2644: wrong UserModeTime and KernelModeTime
Changes in Version 1.6.2
========================
diff --git a/OSBase_UnixProcess.c b/OSBase_UnixProcess.c
index f974310..b7c050e 100644
--- a/OSBase_UnixProcess.c
+++ b/OSBase_UnixProcess.c
@@ -229,9 +229,9 @@ static int _process_data( char * phd , struct cim_process ** sptr ){
strcat( cmd, "/stat");
if ( (fpstat=fopen(cmd,"r")) != NULL ) {
- fscanf(fpstat,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s "
- "%lld %lld %*s %*s %*s %*s %*s %ld",
- &umtime,&kmtime,&ctime );
+ fscanf(fpstat,"%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s "
+ "%lld %lld %*s %*s %*s %*s %*s %*s %ld",
+ &umtime,&kmtime,&ctime );
fclose(fpstat);
(*sptr)->kmtime = kmtime*10;
(*sptr)->umtime = umtime*10;
diff --git a/contributions.txt b/contributions.txt
index 3d674be..5834f5a 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -25,3 +25,4 @@ Michal Hrušecký, Novell
Henning Sackewitz,
-----------------------
05/28/2013 [ SBLIM-2634 ] incorrect max cpu frequency
+06/11/2013 [ SBLIM-2644 ] wrong UserModeTime and KernelModeTime
hooks/post-receive
--
cmpi-base - Base OS CMPI Providers
|
|
From: Dave H. <hel...@us...> - 2013-06-11 15:19:27
|
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 cfcec8fefd2686b4c8e295821ac122655cf5adeb (commit)
from c44810d31eb20a32fceb80ba57a9ac9a17a9e4f7 (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 cfcec8fefd2686b4c8e295821ac122655cf5adeb
Author: Dave Heller <hel...@us...>
Date: Tue Jun 11 11:17:34 2013 -0400
[sfcb-tix:#55] make uninstall always remove sfcb.cfg
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a49ded5..f28f436 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -590,18 +590,19 @@ install-sfcbconfDATA: $(sfcbconf_DATA)
echo " $(INSTALL_DATA) $$s $$f"; \
$(INSTALL_DATA) "$$s" "$$f"
-# If sfcb.cfg.new exists, uninstall that instead of sfcb.cfg
+# Remove sfcb.cfg.new, move sfcb.cfg to sfcb.cfg.saved
uninstall-sfcbconfDATA:
@f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
if test -f "$$f".new; then \
+ echo " rm -f $$f".new; \
+ rm -f "$$f.new"; \
+ fi; \
+ if test -f "$$f"; then \
echo "**********************************************************************"; \
- echo "** removing $$f.new"; \
- echo "** preserving $$f"; \
+ echo "** moving $$f to $$f.saved"; \
+ mv "$$f" "$$f".saved; \
echo "**********************************************************************"; \
- f="$$f".new; \
- fi; \
- echo " rm -f $$f"; \
- rm -f "$$f"
+ fi
clean-local:
rm -f sfcbrepos sfcbstage sfcbunstage sfcbuuid sfcb.cfg getSchema.sh sfcb \
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-06-10 19:13:33
|
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 8bdab82ba49b4e236009992e84da0d59408a0439 (commit)
from 7756dd421af9be9662a531a880915538084595ba (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 8bdab82ba49b4e236009992e84da0d59408a0439
Author: Dave Heller <hel...@us...>
Date: Mon Jun 10 15:09:41 2013 -0400
[sfcb-tix:#12] Support HTTP Expect: 100-continue header
-----------------------------------------------------------------------
Summary of changes:
httpAdapter.c | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/httpAdapter.c b/httpAdapter.c
index d732875..caf023e 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -181,6 +181,7 @@ typedef struct _buffer {
unsigned int length,
size,
ptr;
+ unsigned int header_length;
unsigned int content_length;
int trailers;
char *httpHdr,
@@ -386,7 +387,7 @@ static void
freeBuffer(Buffer * b)
{
Buffer emptyBuf =
- { NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL,
+ { NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL,
NULL
};
if (b->data)
@@ -552,6 +553,21 @@ dumpResponse(RespSegments * rs)
}
static void
+write100ContResponse(CommHndl conn_fd)
+{
+ static char head[] = { "HTTP/1.1 100 Continue\r\n" };
+ static char end[] = { "\r\n" };
+
+ _SFCB_ENTER(TRACE_HTTPDAEMON, "write100ContResponse");
+
+ commWrite(conn_fd, head, strlen(head));
+ commWrite(conn_fd, end, strlen(end));
+ commFlush(conn_fd);
+
+ _SFCB_EXIT();
+}
+
+static void
writeResponse(CommHndl conn_fd, RespSegments rs)
{
@@ -819,9 +835,13 @@ getHdrs(CommHndl conn_fd, Buffer * b)
/*
* success condition: end of header
*/
- if (strstr(b->data, "\r\n\r\n") != NULL ||
- strstr(b->data, "\n\n") != NULL) {
- break;
+ char *eoh;
+ if ((eoh = strstr(b->data, "\r\n\r\n")) != NULL) {
+ b->header_length = (unsigned int)(eoh - b->data + 4);
+ break;
+ } else if ((eoh = strstr(b->data, "\n\n")) != NULL) {
+ b->header_length = (unsigned int)(eoh - b->data + 2);
+ break;
}
if (total >= hdrLimmit) {
@@ -1041,9 +1061,14 @@ doHttpRequest(CommHndl conn_fd)
cp += strspn(cp, " \t");
if (strncasecmp(cp, "trailers", 8) == 0)
inBuf.trailers = 1;
- } else if (strncasecmp(hdr, "Expect:", 7) == 0) {
- if (!discardInput) {
- genError(conn_fd, &inBuf, 417, "Expectation Failed", NULL); // more);
+ } else if (!discardInput && !strncasecmp(hdr, "Expect:", 7)) {
+ if (!strncasecmp(inBuf.protocol, "HTTP/1.1", 8) &&
+ !strncasecmp(hdr+8 + strspn(hdr+8, " \t"), "100-continue", 12)) {
+ // Send the reply only if we have not yet received any of the payload
+ if (inBuf.length == inBuf.header_length)
+ write100ContResponse(conn_fd);
+ } else {
+ genError(conn_fd, &inBuf, 417, "Expectation Failed", NULL);
discardInput = 2;
}
}
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2013-06-10 15:28:43
|
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 7756dd421af9be9662a531a880915538084595ba (commit)
from 9c1bb3284c083fa4a647e03c63483c320e56a35c (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 7756dd421af9be9662a531a880915538084595ba
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Jun 10 11:28:02 2013 -0400
[sfcb-tix:#55] make uninstall always remove sfcb.cfg
Additional call to make uninstall in ABTscript.
-----------------------------------------------------------------------
Summary of changes:
test/ABT/ABTScript | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/test/ABT/ABTScript b/test/ABT/ABTScript
index ad81cfc..81fc826 100755
--- a/test/ABT/ABTScript
+++ b/test/ABT/ABTScript
@@ -291,6 +291,7 @@ if [ ! -d $BASE_DIR/sfcb ]; then
AUTO_CONF
fi
CONFIGURE_SFCB
+SFCB_CLEAN
echo "<a href=./coverage/index.html>Code Coverage Report</a><br>" >> $HTMLFILE
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2013-06-06 17:27:23
|
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 9c1bb3284c083fa4a647e03c63483c320e56a35c (commit)
from 0dc5fc03dbabae41f81d2cc92dc3176d8333a799 (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 9c1bb3284c083fa4a647e03c63483c320e56a35c
Author: Michael Chase-Salerno <br...@li...>
Date: Thu Jun 6 13:25:19 2013 -0400
[sfcb-tix:#56] Intermittent segfault at shutdown
Relocate trace_stop due to timing issue on shmdt() call
-----------------------------------------------------------------------
Summary of changes:
sfcBroker.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sfcBroker.c b/sfcBroker.c
index 3d15a2d..7e1762e 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -274,10 +274,10 @@ stopBroker()
pthread_mutex_unlock(&syncMtx);
- _SFCB_TRACE_STOP();
-
unloadHostnameLib();
+ _SFCB_TRACE_STOP();
+
if (restartBroker) {
char *emsg = strerror(errno);
execvp("sfcbd", restartArgv);
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-06-06 04:19: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 "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 0dc5fc03dbabae41f81d2cc92dc3176d8333a799 (commit)
from 85e3af961d5633595659377fb5847e1266fbac2a (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 0dc5fc03dbabae41f81d2cc92dc3176d8333a799
Author: Dave Heller <hel...@us...>
Date: Thu Jun 6 00:14:36 2013 -0400
[sfcb-tix:#55] make uninstall always remove sfcb.cfg
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 68aa837..aa5074e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -528,18 +528,19 @@ install-sfcbconfDATA: $(sfcbconf_DATA)
echo " $(INSTALL_DATA) $$s $$f"; \
$(INSTALL_DATA) "$$s" "$$f"
-# If sfcb.cfg.new exists, uninstall that instead of sfcb.cfg
+# Remove sfcb.cfg.new, move sfcb.cfg to sfcb.cfg.saved
uninstall-sfcbconfDATA:
@f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
if test -f "$$f".new; then \
+ echo " rm -f $$f".new; \
+ rm -f "$$f.new"; \
+ fi; \
+ if test -f "$$f"; then \
echo "**********************************************************************"; \
- echo "** removing $$f.new"; \
- echo "** preserving $$f"; \
+ echo "** moving $$f to $$f.saved"; \
+ mv "$$f" "$$f".saved; \
echo "**********************************************************************"; \
- f="$$f".new; \
- fi; \
- echo " rm -f $$f"; \
- rm -f "$$f"
+ fi
clean-local:
rm -f sfcbrepos sfcbstage sfcbunstage sfcbuuid sfcb.cfg getSchema.sh sfcb \
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2013-06-04 23:43:24
|
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 85e3af961d5633595659377fb5847e1266fbac2a (commit)
via cd904dec209fb7462c6fbf0f9143c0854702583c (commit)
from 10ae1a730dd4e58ec36f3fbc38203692aa64e8d2 (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 85e3af961d5633595659377fb5847e1266fbac2a
Merge: cd904de 10ae1a7
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Jun 4 19:42:57 2013 -0400
Merge branch 'master' of ssh://git.code.sf.net/p/sblim/sfcb
commit cd904dec209fb7462c6fbf0f9143c0854702583c
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Jun 4 19:41:09 2013 -0400
[sfcb-tix:#18] disable default properties breaks test
Modified failing tests, also made test case insensitive
and fixed result file naming
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
.../tests/Test1EnumerateInstances.lines | 28 ----------
test/TestProviders/tests/Test7ExecQuery.lines | 3 -
test/TestProviders/tests/Test7ExecQuery1.lines | 8 ---
test/TestProviders/tests/Test7ExecQuery2.lines | 6 --
test/TestProviders/tests/Test7ExecQuery3.lines | 10 ----
test/TestProviders/tests/Test7ExecQuery4.lines | 6 --
test/TestProviders/tests/Test7ExecQuery5.lines | 8 ---
test/TestProviders/tests/TestMisc8.lines | 1 -
test/TestProviders/tests/xmltest.sh | 6 +-
test/xmltest/CHS_AI_IS.lines | 3 +-
test/xmltest/ECTP_AI_IS.lines | 2 +-
test/xmltest/EnumerateClasses1.lines | 4 --
...{InstanceTest2Get.OK => InstanceTest2Get.lines} | 3 -
test/xmltest/LD_modify01-create.lines | 3 +-
test/xmltest/Makefile.am | 6 ++
test/xmltest/SAE_03_AI_IF.lines | 42 ---------------
.../enumerateInstance_CIM_IndicationService.lines | 54 --------------------
test/xmltest/execQuery10.prereq | 8 +++
test/xmltest/execQuery7.prereq | 8 +++
test/xmltest/execQuery_ServerProv.lines | 33 ------------
test/xmltest/getInstance_NameSpace.lines | 20 -------
test/xmltest/xmltest.sh | 6 +-
23 files changed, 33 insertions(+), 236 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9953c41..056d5c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -583,6 +583,7 @@ AM_CONDITIONAL(IPV6,[test "$enable_ipv6" == "yes"])
AM_CONDITIONAL(LOCAL_CONNECT_NO_INDICATION,[test "$enable_local_connect_only" == "yes" -a "$enable_indications" == "no"])
AM_CONDITIONAL(LOCAL_CONNECT_ONLY,[test "$enable_local_connect_only" == "yes"])
AM_CONDITIONAL(ACCOUNT_PASSTHRU,[test "$enable_expired_pw_update" == "yes"])
+AM_CONDITIONAL(DEFAULT_PROPERTIES,[test "$enable_default_properties" == "yes"])
AC_CONFIG_FILES([Makefile sfcb.spec sfcbrepos.sh sfcbstage.sh sfcbunstage.sh
sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre 20_indication.mof.pre
diff --git a/test/TestProviders/tests/Test1EnumerateInstances.lines b/test/TestProviders/tests/Test1EnumerateInstances.lines
index ef23387..dff9648 100644
--- a/test/TestProviders/tests/Test1EnumerateInstances.lines
+++ b/test/TestProviders/tests/Test1EnumerateInstances.lines
@@ -3,38 +3,10 @@
<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
<INSTANCE CLASSNAME="Sample_Instance">
<PROPERTY NAME="Identifier" TYPE="uint8">
-<PROPERTY NAME="Einst" EmbeddedObject="instance" TYPE="string">
-<VALUE><INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>1</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Einst" EmbeddedObject="instance" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Eobj" EmbeddedObject="object" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>I&apos;m an EmbeddedInstance</VALUE>
-</PROPERTY>
-</INSTANCE>
-<PROPERTY NAME="Eobj" EmbeddedObject="object" TYPE="string">
-<VALUE><INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>1</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Einst" EmbeddedObject="instance" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Eobj" EmbeddedObject="object" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>I&apos;m an EmbeddedObject</VALUE>
-</PROPERTY>
-</INSTANCE>
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Hello World</VALUE>
<KEYVALUE VALUETYPE="numeric">2</KEYVALUE>
<VALUE>2</VALUE>
-<PROPERTY NAME="Einst" EmbeddedObject="instance" TYPE="string">
-<PROPERTY NAME="Eobj" EmbeddedObject="object" TYPE="string">
<VALUE>Yo Planet</VALUE>
<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
<VALUE>3</VALUE>
diff --git a/test/TestProviders/tests/Test7ExecQuery.lines b/test/TestProviders/tests/Test7ExecQuery.lines
index 6bc79f1..1df48bf 100644
--- a/test/TestProviders/tests/Test7ExecQuery.lines
+++ b/test/TestProviders/tests/Test7ExecQuery.lines
@@ -5,9 +5,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>1</VALUE>
-</PROPERTY>
</INSTANCE>
diff --git a/test/TestProviders/tests/Test7ExecQuery1.lines b/test/TestProviders/tests/Test7ExecQuery1.lines
index 1cac895..a82b71a 100644
--- a/test/TestProviders/tests/Test7ExecQuery1.lines
+++ b/test/TestProviders/tests/Test7ExecQuery1.lines
@@ -5,8 +5,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>1</VALUE>
</PROPERTY>
@@ -18,9 +16,3 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>2</VALUE>
-</PROPERTY>
-</INSTANCE>
diff --git a/test/TestProviders/tests/Test7ExecQuery2.lines b/test/TestProviders/tests/Test7ExecQuery2.lines
index ffc8423..f76e282 100644
--- a/test/TestProviders/tests/Test7ExecQuery2.lines
+++ b/test/TestProviders/tests/Test7ExecQuery2.lines
@@ -5,8 +5,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>1</VALUE>
</PROPERTY>
@@ -18,8 +16,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>2</VALUE>
</PROPERTY>
@@ -31,8 +27,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>3</VALUE>
</PROPERTY>
diff --git a/test/TestProviders/tests/Test7ExecQuery3.lines b/test/TestProviders/tests/Test7ExecQuery3.lines
index 71c6334..86eea77 100644
--- a/test/TestProviders/tests/Test7ExecQuery3.lines
+++ b/test/TestProviders/tests/Test7ExecQuery3.lines
@@ -2,20 +2,10 @@
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Hello World</VALUE>
</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
</INSTANCE>
<INSTANCE CLASSNAME="Sample_Instance">
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Yo Planet</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
-</INSTANCE>
<INSTANCE CLASSNAME="Sample_Instance">
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Hey Earth</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
-</INSTANCE>
diff --git a/test/TestProviders/tests/Test7ExecQuery4.lines b/test/TestProviders/tests/Test7ExecQuery4.lines
index e34d3b8..7223982 100644
--- a/test/TestProviders/tests/Test7ExecQuery4.lines
+++ b/test/TestProviders/tests/Test7ExecQuery4.lines
@@ -1,7 +1,5 @@
<VALUE>Hello World</VALUE>
</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
</INSTANCE>
</VALUE.OBJECTWITHPATH>
<VALUE.OBJECTWITHPATH>
@@ -9,7 +7,3 @@
<INSTANCE CLASSNAME="Sample_Instance">
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Yo Planet</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
-</INSTANCE>
diff --git a/test/TestProviders/tests/Test7ExecQuery5.lines b/test/TestProviders/tests/Test7ExecQuery5.lines
index eb83b63..3dd5d67 100644
--- a/test/TestProviders/tests/Test7ExecQuery5.lines
+++ b/test/TestProviders/tests/Test7ExecQuery5.lines
@@ -5,8 +5,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>1</VALUE>
</PROPERTY>
@@ -15,12 +13,6 @@
<KEYBINDING NAME="Identifier">
<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
</KEYBINDING>
-</INSTANCENAME>
-</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>3</VALUE>
-</PROPERTY>
-</INSTANCE>
diff --git a/test/TestProviders/tests/TestMisc8.lines b/test/TestProviders/tests/TestMisc8.lines
index 76bb0b0..6ab145c 100644
--- a/test/TestProviders/tests/TestMisc8.lines
+++ b/test/TestProviders/tests/TestMisc8.lines
@@ -1,6 +1,5 @@
<METHODRESPONSE NAME="TestCMPIBroker">
<RETURNVALUE PARAMTYPE="uint32">
-<VALUE>0</VALUE>
</RETURNVALUE>
<PARAMVALUE NAME="Result" PARAMTYPE="string">
<VALUE>_testCMPIInstance </VALUE>
diff --git a/test/TestProviders/tests/xmltest.sh b/test/TestProviders/tests/xmltest.sh
index 3037e58..8ade2ed 100755
--- a/test/TestProviders/tests/xmltest.sh
+++ b/test/TestProviders/tests/xmltest.sh
@@ -42,7 +42,7 @@ do
_TEST=${xmlfile%.xml}
_TESTOK=$_TEST.OK
_TESTLINES=$_TEST.lines
- _TESTRESULT=$(basename _TEST).result
+ _TESTRESULT=$_TEST.result
_TESTPREREQ=$_TEST.prereq
_TESTNAME=$_TEST
@@ -97,7 +97,7 @@ do
notline=$(echo $line | awk '{ line=index($line,"!"); print line; }' )
if [ "$notline" != 0 ] ; then
text=$(echo $line | awk '{ line=substr($line, 2); print line; }' )
- if grep -F --q "$text" $_TESTRESULT ; then
+ if grep -Fi --q "$text" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
printf $red
echo "FAILED disallowed line found"
@@ -110,7 +110,7 @@ do
fi
else
# Check for required lines
- if ! grep -F --q "$line" $_TESTRESULT ; then
+ if ! grep -Fi --q "$line" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
printf $red
echo "FAILED required line not found"
diff --git a/test/xmltest/CHS_AI_IS.lines b/test/xmltest/CHS_AI_IS.lines
index 7dba4f5..221f0b5 100644
--- a/test/xmltest/CHS_AI_IS.lines
+++ b/test/xmltest/CHS_AI_IS.lines
@@ -1,5 +1,4 @@
<IMETHODRESPONSE NAME="Associators">
<KEYVALUE VALUETYPE="string">CIM_System</KEYVALUE>
<INSTANCE CLASSNAME="CIM_System">
-<PROPERTY NAME="PrimaryOwnerContact" TYPE="string">
-
+<PROPERTY.ARRAY NAME="AdvertiseTypes" TYPE="uint16">
diff --git a/test/xmltest/ECTP_AI_IS.lines b/test/xmltest/ECTP_AI_IS.lines
index 5bec0ee..afc9796 100644
--- a/test/xmltest/ECTP_AI_IS.lines
+++ b/test/xmltest/ECTP_AI_IS.lines
@@ -1,5 +1,5 @@
<IMETHODRESPONSE NAME="Associators">
<INSTANCENAME CLASSNAME="CIM_System">
-<PROPERTY.ARRAY NAME="IdentifyingDescriptions" TYPE="string">
+<PROPERTY.ARRAY NAME="AdvertiseTypes" TYPE="uint16">
<INSTANCE CLASSNAME="SFCB_RegisteredProfile">
<PROPERTY NAME="RegisteredVersion" TYPE="string">
diff --git a/test/xmltest/EnumerateClasses1.lines b/test/xmltest/EnumerateClasses1.lines
index f3c2ca5..2d4739d 100644
--- a/test/xmltest/EnumerateClasses1.lines
+++ b/test/xmltest/EnumerateClasses1.lines
@@ -17,8 +17,4 @@
<QUALIFIER NAME="Description" TYPE="string">
<VALUE>The following class describes LogicalVolume as depicted on PDM'sMr_LogicalVolume</VALUE>
</QUALIFIER>
-<PROPERTY NAME="key" TYPE="sint32">
-<QUALIFIER NAME="Key" TYPE="boolean">
-<VALUE>TRUE</VALUE>
-</QUALIFIER>
</PROPERTY>
diff --git a/test/xmltest/InstanceTest2Get.OK b/test/xmltest/InstanceTest2Get.lines
similarity index 81%
rename from test/xmltest/InstanceTest2Get.OK
rename to test/xmltest/InstanceTest2Get.lines
index 56ad526..62a10cf 100644
--- a/test/xmltest/InstanceTest2Get.OK
+++ b/test/xmltest/InstanceTest2Get.lines
@@ -5,9 +5,6 @@
<IMETHODRESPONSE NAME="GetInstance">
<IRETURNVALUE>
<INSTANCE CLASSNAME="TEST_Person">
-<PROPERTY NAME="extraProperty" TYPE="string">
-<VALUE>defaultvalue</VALUE>
-</PROPERTY>
<PROPERTY NAME="name" TYPE="string">
<VALUE>Michael</VALUE>
</PROPERTY>
diff --git a/test/xmltest/LD_modify01-create.lines b/test/xmltest/LD_modify01-create.lines
index 4c216ca..95ae5e5 100644
--- a/test/xmltest/LD_modify01-create.lines
+++ b/test/xmltest/LD_modify01-create.lines
@@ -1,3 +1,4 @@
-<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ListenerDestinationCIMXML</KEYVALUE>
</KEYBINDING>
+<IMETHODRESPONSE NAME="CreateInstance">
+<INSTANCENAME CLASSNAME="CIM_ListenerDestinationCIMXML">
diff --git a/test/xmltest/Makefile.am b/test/xmltest/Makefile.am
index b30cd14..2c01f4f 100644
--- a/test/xmltest/Makefile.am
+++ b/test/xmltest/Makefile.am
@@ -30,6 +30,12 @@ else
export SFCB_TEST_PROTOCOL=http
endif
+if DEFAULT_PROPERTIES
+ export DEFAULT_PROPERTIES=yes
+else
+ export DEFAULT_PROPERTIES=no
+endif
+
#Some wbemcat tests
export SRCDIR=$(srcdir)
TESTS = xmltest.sh
diff --git a/test/xmltest/SAE_03_AI_IF.lines b/test/xmltest/SAE_03_AI_IF.lines
index 6737609..8573f37 100644
--- a/test/xmltest/SAE_03_AI_IF.lines
+++ b/test/xmltest/SAE_03_AI_IF.lines
@@ -8,73 +8,31 @@
<PROPERTY NAME="SubscriptionRemovalTimeInterval" TYPE="uint32">
</PROPERTY>
<PROPERTY NAME="SubscriptionRemovalAction" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryInterval" TYPE="uint32">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryAttempts" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="FilterCreationEnabled" TYPE="boolean">
<VALUE>TRUE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TransitioningToState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledDefault" TYPE="uint16">
-<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="RequestedState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledState" TYPE="uint16">
-<VALUE>5</VALUE>
-</PROPERTY>
<PROPERTY NAME="ElementName" TYPE="string">
<VALUE>sfcb</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
</INSTANCE>
<INSTANCENAME CLASSNAME="CIM_IndicationService">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_IndicationService</KEYVALUE>
-</KEYBINDING>
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-</INSTANCEPATH>
<INSTANCE CLASSNAME="CIM_IndicationService">
<PROPERTY NAME="SubscriptionRemovalTimeInterval" TYPE="uint32">
-</PROPERTY>
<PROPERTY NAME="SubscriptionRemovalAction" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryInterval" TYPE="uint32">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryAttempts" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="FilterCreationEnabled" TYPE="boolean">
<VALUE>TRUE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TransitioningToState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledDefault" TYPE="uint16">
-<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="RequestedState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledState" TYPE="uint16">
-<VALUE>5</VALUE>
-</PROPERTY>
<PROPERTY NAME="ElementName" TYPE="string">
<VALUE>sfcb</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
<PROPERTY NAME="CreationClassName" TYPE="string">
<VALUE>CIM_IndicationService</VALUE>
-</PROPERTY>
</INSTANCE>
diff --git a/test/xmltest/enumerateInstance_CIM_IndicationService.lines b/test/xmltest/enumerateInstance_CIM_IndicationService.lines
index 2968153..9fdeea2 100644
--- a/test/xmltest/enumerateInstance_CIM_IndicationService.lines
+++ b/test/xmltest/enumerateInstance_CIM_IndicationService.lines
@@ -7,72 +7,18 @@
<PROPERTY NAME="SubscriptionRemovalTimeInterval" TYPE="uint32">
</PROPERTY>
<PROPERTY NAME="SubscriptionRemovalAction" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryInterval" TYPE="uint32">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryAttempts" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="FilterCreationEnabled" TYPE="boolean">
<VALUE>TRUE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TransitioningToState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledDefault" TYPE="uint16">
-<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="RequestedState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledState" TYPE="uint16">
-<VALUE>5</VALUE>
-</PROPERTY>
<PROPERTY NAME="ElementName" TYPE="string">
<VALUE>sfcb</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
</INSTANCE>
<INSTANCENAME CLASSNAME="CIM_IndicationService">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_IndicationService</KEYVALUE>
-</KEYBINDING>
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE>
-</KEYBINDING>
</INSTANCENAME>
-<INSTANCE CLASSNAME="CIM_IndicationService">
-<PROPERTY NAME="SubscriptionRemovalTimeInterval" TYPE="uint32">
-</PROPERTY>
-<PROPERTY NAME="SubscriptionRemovalAction" TYPE="uint16">
-</PROPERTY>
-<PROPERTY NAME="DeliveryRetryInterval" TYPE="uint32">
-</PROPERTY>
-<PROPERTY NAME="DeliveryRetryAttempts" TYPE="uint16">
-</PROPERTY>
-<PROPERTY NAME="FilterCreationEnabled" TYPE="boolean">
-<VALUE>TRUE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TransitioningToState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledDefault" TYPE="uint16">
-<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="RequestedState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledState" TYPE="uint16">
-<VALUE>5</VALUE>
-</PROPERTY>
-<PROPERTY NAME="ElementName" TYPE="string">
-<VALUE>sfcb</VALUE>
-</PROPERTY>
-<PROPERTY NAME="SystemCreationClassName" TYPE="string">
-<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
-<PROPERTY NAME="CreationClassName" TYPE="string">
-<VALUE>CIM_IndicationService</VALUE>
-</PROPERTY>
-</INSTANCE>
diff --git a/test/xmltest/execQuery10.prereq b/test/xmltest/execQuery10.prereq
new file mode 100755
index 0000000..678e3ff
--- /dev/null
+++ b/test/xmltest/execQuery10.prereq
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This query won't work with default properties disabled.
+if [ "$DEFAULT_PROPERTIES" != "yes" ]
+then
+ exit 1
+else
+ exit 0
+fi
diff --git a/test/xmltest/execQuery7.prereq b/test/xmltest/execQuery7.prereq
new file mode 100755
index 0000000..678e3ff
--- /dev/null
+++ b/test/xmltest/execQuery7.prereq
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This query won't work with default properties disabled.
+if [ "$DEFAULT_PROPERTIES" != "yes" ]
+then
+ exit 1
+else
+ exit 0
+fi
diff --git a/test/xmltest/execQuery_ServerProv.lines b/test/xmltest/execQuery_ServerProv.lines
index ae1be16..57db6fd 100644
--- a/test/xmltest/execQuery_ServerProv.lines
+++ b/test/xmltest/execQuery_ServerProv.lines
@@ -4,7 +4,6 @@
</KEYBINDING>
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ObjectManager</KEYVALUE>
-</KEYBINDING>
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="CIM_ObjectManager">
@@ -13,46 +12,14 @@
</PROPERTY>
<PROPERTY NAME="GatherStatisticalData" TYPE="boolean">
<VALUE>FALSE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Started" TYPE="boolean">
-</PROPERTY>
-<PROPERTY NAME="StartMode" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="PrimaryOwnerContact" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="PrimaryOwnerName" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="CreationClassName" TYPE="string">
<VALUE>CIM_ObjectManager</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Caption" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="InstanceID" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="InstallDate" TYPE="datetime">
-</PROPERTY>
-<PROPERTY.ARRAY NAME="OperationalStatus" TYPE="uint16">
-</PROPERTY.ARRAY>
-<PROPERTY.ARRAY NAME="StatusDescriptions" TYPE="string">
-</PROPERTY.ARRAY>
-<PROPERTY NAME="Status" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="HealthState" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="EnabledState" TYPE="uint16">
<VALUE>5</VALUE>
-</PROPERTY>
-<PROPERTY NAME="OtherEnabledState" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="RequestedState" TYPE="uint16">
<VALUE>5</VALUE>
-</PROPERTY>
<PROPERTY NAME="EnabledDefault" TYPE="uint16">
<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TimeOfLastStateChange" TYPE="datetime">
-</PROPERTY>
</INSTANCE>
diff --git a/test/xmltest/getInstance_NameSpace.lines b/test/xmltest/getInstance_NameSpace.lines
index 07f888c..fce936a 100644
--- a/test/xmltest/getInstance_NameSpace.lines
+++ b/test/xmltest/getInstance_NameSpace.lines
@@ -1,33 +1,13 @@
<INSTANCE CLASSNAME="CIM_Namespace">
-<PROPERTY NAME="DescriptionOfClassType" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="ClassTypeVersion" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="ClassType" TYPE="uint16">
-</PROPERTY>
-<PROPERTY NAME="DescriptionOfClassInfo" TYPE="string">
</PROPERTY>
<PROPERTY NAME="ClassInfo" TYPE="uint16">
<VALUE>0</VALUE>
-</PROPERTY>
<PROPERTY NAME="Name" TYPE="string">
<VALUE>root/interop</VALUE>
-</PROPERTY>
<PROPERTY NAME="CreationClassName" TYPE="string">
<VALUE>CIM_Namespace</VALUE>
-</PROPERTY>
<PROPERTY NAME="ObjectManagerCreationClassName" TYPE="string">
<VALUE>CIM_ObjectManager</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
-<PROPERTY NAME="InstanceID" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Caption" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Description" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="ElementName" TYPE="string">
-</PROPERTY>
</INSTANCE>
diff --git a/test/xmltest/xmltest.sh b/test/xmltest/xmltest.sh
index a6051ad..db33232 100755
--- a/test/xmltest/xmltest.sh
+++ b/test/xmltest/xmltest.sh
@@ -42,7 +42,7 @@ do
_TEST=${xmlfile%.xml}
_TESTOK=$_TEST.OK
_TESTLINES=$_TEST.lines
- _TESTRESULT=$(basename _TEST).result
+ _TESTRESULT=$_TEST.result
_TESTPREREQ=$_TEST.prereq
_TESTNAME=$_TEST
@@ -100,7 +100,7 @@ do
notline=$(echo $line | awk '{ line=index($line,"!"); print line; }' )
if [ "$notline" != 0 ] ; then
text=$(echo $line | awk '{ line=substr($line, 2); print line; }' )
- if grep -F --q "$text" $_TESTRESULT ; then
+ if grep -Fi --q "$text" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
echo -n "FAILED disallowed line found"
passed=1
@@ -111,7 +111,7 @@ do
fi
else
# Check for required lines
- if ! grep -F --q "$line" $_TESTRESULT ; then
+ if ! grep -Fi --q "$line" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
printf $red
echo -n "FAILED required line not found"
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-06-04 15:18:33
|
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 10ae1a730dd4e58ec36f3fbc38203692aa64e8d2 (commit)
from c4bb84b4949ec151dda40e953dfc20aa9e908958 (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 10ae1a730dd4e58ec36f3fbc38203692aa64e8d2
Author: Dave Heller <hel...@us...>
Date: Tue Jun 4 11:09:40 2013 -0400
[sfcb-tix:#55] make install should not overwrite sfcb.cfg
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 31 +++++++++++++++++++++++++++++++
sfcb.spec.in | 3 ++-
sfcbproc.c | 2 +-
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 044a7b8..68aa837 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -510,6 +510,37 @@ if TEST_ENABLED
./test/stageschema.sh -d test/schema -p $(prefix) -u
endif
+# If sfcb.cfg already exists, install as sfcb.cfg.new
+install-sfcbconfDATA: $(sfcbconf_DATA)
+ @test -z "$(sfcbconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sfcbconfdir)"; \
+ s="$(srcdir)/sfcb.cfg"; \
+ f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
+ if test -f "$$f"; then \
+ if ! diff -wB "$$s" "$$f" >/dev/null 2>/dev/null; then \
+ echo "**********************************************************************"; \
+ echo "** existing config $$f preserved"; \
+ echo "** new config installed as $$f.new"; \
+ echo "** (you may want to merge config files when updating SFCB version)"; \
+ echo "**********************************************************************"; \
+ f="$$f".new; \
+ fi; \
+ fi; \
+ echo " $(INSTALL_DATA) $$s $$f"; \
+ $(INSTALL_DATA) "$$s" "$$f"
+
+# If sfcb.cfg.new exists, uninstall that instead of sfcb.cfg
+uninstall-sfcbconfDATA:
+ @f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
+ if test -f "$$f".new; then \
+ echo "**********************************************************************"; \
+ echo "** removing $$f.new"; \
+ echo "** preserving $$f"; \
+ echo "**********************************************************************"; \
+ f="$$f".new; \
+ fi; \
+ echo " rm -f $$f"; \
+ rm -f "$$f"
+
clean-local:
rm -f sfcbrepos sfcbstage sfcbunstage sfcbuuid sfcb.cfg getSchema.sh sfcb \
sfcb.init-redhat sfcb.init-suse sfcb.init-none sfcb-dox.conf \
diff --git a/sfcb.spec.in b/sfcb.spec.in
index 08adb9d..9757e84 100644
--- a/sfcb.spec.in
+++ b/sfcb.spec.in
@@ -84,7 +84,8 @@ echo "%{_sysconfdir}/init.d/sfcb" >> _pkg_list
echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
echo "%{_bindir}/*" >> _pkg_list
echo "%{_sbindir}/*" >> _pkg_list
-echo "%{_libdir}/*.so*" >> _pkg_list
+echo "%{_libdir}/sfcb/*.so*" >> _pkg_list
+echo "%{_libdir}/sfcb/*.la*" >> _pkg_list
echo =======================================
cat _pkg_list
diff --git a/sfcbproc.c b/sfcbproc.c
index 94ad542..ae2c8a5 100644
--- a/sfcbproc.c
+++ b/sfcbproc.c
@@ -674,5 +674,5 @@ int main(int argc, char **argv) {
printf("%5d %5d %5d %-4c %s\n", p->pid, p->ppid, p->pgrp, p->state, role);
}
- _exit(0);
+ exit(0);
}
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-06-04 15:18:20
|
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 c44810d31eb20a32fceb80ba57a9ac9a17a9e4f7 (commit)
from a4bda05412b66be11493bddcece7dc727a1c0908 (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 c44810d31eb20a32fceb80ba57a9ac9a17a9e4f7
Author: Dave Heller <hel...@us...>
Date: Tue Jun 4 11:09:36 2013 -0400
[sfcb-tix:#55] make install should not overwrite sfcb.cfg
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 31 +++++++++++++++++++++++++++++++
sfcb.spec.in | 3 ++-
sfcbproc.c | 2 +-
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f6b0184..a49ded5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -572,6 +572,37 @@ if DOCS
rm -rf $(DESTDIR)$(sfcbdocdir)/html
endif
+# If sfcb.cfg already exists, install as sfcb.cfg.new
+install-sfcbconfDATA: $(sfcbconf_DATA)
+ @test -z "$(sfcbconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sfcbconfdir)"; \
+ s="$(srcdir)/sfcb.cfg"; \
+ f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
+ if test -f "$$f"; then \
+ if ! diff -wB "$$s" "$$f" >/dev/null 2>/dev/null; then \
+ echo "**********************************************************************"; \
+ echo "** existing config $$f preserved"; \
+ echo "** new config installed as $$f.new"; \
+ echo "** (you may want to merge config files when updating SFCB version)"; \
+ echo "**********************************************************************"; \
+ f="$$f".new; \
+ fi; \
+ fi; \
+ echo " $(INSTALL_DATA) $$s $$f"; \
+ $(INSTALL_DATA) "$$s" "$$f"
+
+# If sfcb.cfg.new exists, uninstall that instead of sfcb.cfg
+uninstall-sfcbconfDATA:
+ @f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
+ if test -f "$$f".new; then \
+ echo "**********************************************************************"; \
+ echo "** removing $$f.new"; \
+ echo "** preserving $$f"; \
+ echo "**********************************************************************"; \
+ f="$$f".new; \
+ fi; \
+ echo " rm -f $$f"; \
+ rm -f "$$f"
+
clean-local:
rm -f sfcbrepos sfcbstage sfcbunstage sfcbuuid sfcb.cfg getSchema.sh sfcb \
sfcb.init-redhat sfcb.init-suse sfcb.init-none sfcb-dox.conf \
diff --git a/sfcb.spec.in b/sfcb.spec.in
index 7c8ba0e..d0c8d88 100644
--- a/sfcb.spec.in
+++ b/sfcb.spec.in
@@ -82,7 +82,8 @@ echo "%{_sysconfdir}/init.d/sfcb" >> _pkg_list
echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
echo "%{_bindir}/*" >> _pkg_list
echo "%{_sbindir}/*" >> _pkg_list
-echo "%{_libdir}/*.so*" >> _pkg_list
+echo "%{_libdir}/sfcb/*.so*" >> _pkg_list
+echo "%{_libdir}/sfcb/*.la*" >> _pkg_list
echo =======================================
cat _pkg_list
diff --git a/sfcbproc.c b/sfcbproc.c
index 94ad542..ae2c8a5 100644
--- a/sfcbproc.c
+++ b/sfcbproc.c
@@ -674,5 +674,5 @@ int main(int argc, char **argv) {
printf("%5d %5d %5d %-4c %s\n", p->pid, p->ppid, p->pgrp, p->state, role);
}
- _exit(0);
+ exit(0);
}
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2013-05-31 23:08:52
|
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 c4bb84b4949ec151dda40e953dfc20aa9e908958 (commit)
from 3398557882817013a610c14ec2ca2dddab11c7ec (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 c4bb84b4949ec151dda40e953dfc20aa9e908958
Author: Michael Chase-Salerno <br...@li...>
Date: Fri May 31 19:08:24 2013 -0400
Make sure repo is clean before ABT run.
-----------------------------------------------------------------------
Summary of changes:
test/ABT/ABTScript | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/test/ABT/ABTScript b/test/ABT/ABTScript
index c5ba77e..ad81cfc 100755
--- a/test/ABT/ABTScript
+++ b/test/ABT/ABTScript
@@ -233,6 +233,7 @@ BUILD_SFCB()
if make install 1>>${REPORTDIR}/${MAKE_OUT} 2>&1
then
DUALOUT "MAKE INSTALL : SUCCESS" "./$MAKE_OUT"
+ sfcbrepos -fi # Ensure we have a clean repo
if make postinstall 1>>${REPORTDIR}/${MAKE_OUT} 2>&1
then
RC=0
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2013-05-31 15:48:46
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15406 Modified Files: Tag: CIM_CLIENT_2_2_3_M sblim-cim-client2.spec build.xml Log Message: 2.2.3 release work Index: sblim-cim-client2.spec =================================================================== RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v retrieving revision 1.29 retrieving revision 1.29.2.1 diff -u -d -r1.29 -r1.29.2.1 --- sblim-cim-client2.spec 31 May 2013 11:07:50 -0000 1.29 +++ sblim-cim-client2.spec 31 May 2013 15:48:44 -0000 1.29.2.1 @@ -1,7 +1,7 @@ %define name sblim-cim-client2 %define project_folder %{name}-%{version}-src %define archive_folder build -%define version HEAD +%define version 2.2.3 %define release 1jpp %define section free Index: build.xml =================================================================== RCS file: /cvsroot/sblim/jsr48-client/build.xml,v retrieving revision 1.48 retrieving revision 1.48.4.1 diff -u -d -r1.48 -r1.48.4.1 --- build.xml 6 Feb 2013 13:05:46 -0000 1.48 +++ build.xml 31 May 2013 15:48:44 -0000 1.48.4.1 @@ -36,7 +36,7 @@ <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, 2013" /> - <property name="Manifest.version" value="HEAD" /> + <property name="Manifest.version" value="2.2.3" /> <property name="Directory.source.core" value="${basedir}/src" /> <property name="Directory.source.samples" value="${basedir}/smpl" /> |
|
From: Dave B. <bla...@us...> - 2013-05-31 11:07:52
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21493 Modified Files: NEWS sblim-cim-client2.spec ChangeLog Log Message: 2.2.3 release work Index: sblim-cim-client2.spec =================================================================== RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- sblim-cim-client2.spec 15 Mar 2013 09:30:09 -0000 1.28 +++ sblim-cim-client2.spec 31 May 2013 11:07:50 -0000 1.29 @@ -158,6 +158,20 @@ # ----------------------------------------------------------------------------- %changelog +* Fri May 31 2013 Dave Blaschke <bla...@us...> +- New release 2.2.3 + o 2643 Update detailed release history HTML for 2.2.3 + o 2642 Seperate properties needed for cim client and listener to filter out ciphers + o 2635 Slowloris DoS attack for CIM indication listener port + o 2640 Multiple CDATA parsing broken in DOM parser + o 2639 CDATA parsing broken in PULL parser + o 2638 Do not build empty REFERENCECLASS + o 2637 Add nested embedded instance builder test + o 2636 Nested embedded instances cause CIMXMLParseException + o 2632 Potential Null Point Exception in CIMDataType + o 2605 SAX parser throws wrong exception + o 2628 Limit size of LinkedList of CIMEvents to be dispatched + * Fri Mar 15 2013 Dave Blaschke <bla...@us...> - New release 2.2.2 o 2624 Update detailed release history HTML for 2.2.2 Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.356 retrieving revision 1.357 diff -u -d -r1.356 -r1.357 --- NEWS 30 May 2013 13:18:18 -0000 1.356 +++ NEWS 31 May 2013 11:07:50 -0000 1.357 @@ -1,4 +1,4 @@ -Changes in HEAD +Version 2.2.3 ================ 2643 Update detailed release history HTML for 2.2.3 2642 Seperate properties needed for cim client and listener to filter out ciphers Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/jsr48-client/ChangeLog,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ChangeLog 15 Mar 2013 09:30:09 -0000 1.27 +++ ChangeLog 31 May 2013 11:07:50 -0000 1.28 @@ -1,3 +1,116 @@ +Release 2.2.3 +============= + +Thu May 30 08:18:18 CDT 2013 blaschke-oss + + 2643 Update detailed release history HTML for 2.2.3 + + history.html 1.10 + NEWS 1.356 + +Thu May 30 08:10:35 CDT 2013 blaschke-oss + + 2642 Seperate properties needed for cim client and listener to filter out ciphers + + WBEMConfiguration.java 1.51 + HttpServerConnection.java 1.18 + HttpClientPool.java 1.15 + HttpClient.java 1.48 + WBEMConfigurationProperties.java 1.54 + sblim-cim-client2.properties 1.36 + NEWS 1.355 + +Thu May 30 07:25:24 CDT 2013 blaschke-oss + + 2635 Slowloris DoS attack for CIM indication listener port + + WBEMListenerTest.java 1.5 + WBEMConstants.java 1.17 + WBEMConfigurationDefaults.java 1.35 + WBEMConfiguration.java 1.50 + MessageReader.java 1.10 + HttpHeader.java 1.14 + HttpConnectionHandler.java 1.11 + unittest.html 1.30 + WBEMListenerSBLIM.java 1.23 + WBEMConfigurationProperties.java 1.53 + sblim-cim-client2.properties 1.35 + NEWS 1.354 + +Mon May 27 14:13:33 CDT 2013 blaschke-oss + + 2640 Multiple CDATA parsing broken in DOM parser + + enumerateClasses.xml 1.10 + CIMXMLParserImpl.java 1.53 + NEWS 1.353 + +Mon May 27 14:03:43 CDT 2013 blaschke-oss + + 2639 CDATA parsing broken in PULL parser + + enumerateClasses.xml 1.9 + XMLPullParser.java 1.24 + NEWS 1.352 + +Mon May 27 13:56:31 CDT 2013 blaschke-oss + + 2638 Do not build empty REFERENCECLASS + + CIMXMLBuilderImpl.java 1.37 + NEWS 1.351 + +Mon May 27 13:46:18 CDT 2013 blaschke-oss + + 2637 Add nested embedded instance builder test + + NestedEmbInstTest.java 1.3 + unittest.html 1.29 + NEWS 1.350 + +Mon May 27 10:03:55 CDT 2013 blaschke-oss + + 2636 Nested embedded instances cause CIMXMLParseException + + NestedEmbInst.xml 1.2 + NestedEmbInstTest.java 1.2 + testcases.parser.txt 1.11 + PropertyReferenceNode.java 1.10 + ParameterReferenceNode.java 1.6 + ParameterRefArrayNode.java 1.11 + CIMXMLParserImpl.java 1.52 + unittest.html 1.28 + NEWS 1.349 + +Mon May 27 08:40:36 CDT 2013 blaschke-oss + + 2632 Potential Null Point Exception in CIMDataType + + CIMDataTypeTest.java 1.6 + CIMDataType.java 1.19 + NEWS 1.348 + +Wed May 08 12:55:16 CDT 2013 buccella + + 2605 SAX parser throws wrong exception + + ParameterRefArrayNode.java 1.10 + ParamValueNode.java 1.9 + Node.java 1.14 + NEWS 1.347 + +Wed May 08 12:30:35 CDT 2013 blaschke-oss + + 2628 Limit size of LinkedList of CIMEvents to be dispatched + + CIMEventDispatcher.java 1.14 + WBEMConfigurationDefaults.java 1.34 + sblim-cim-client2.properties 1.34 + NEWS 1.346 + WBEMConfiguration.java 1.49 + WBEMListenerSBLIM.java 1.22 + WBEMConfigurationProperties.java 1.52 + Release 2.2.2 ============= |
|
From: Dave B. <bla...@us...> - 2013-05-30 13:36:48
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/pullparser In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5453/src/org/sblim/cimclient/internal/pullparser Modified Files: Tag: Experimental XMLPullParser.java Log Message: Whitespace clean-up Index: XMLPullParser.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/pullparser/XMLPullParser.java,v retrieving revision 1.7.2.18 retrieving revision 1.7.2.19 diff -u -d -r1.7.2.18 -r1.7.2.19 --- XMLPullParser.java 11 May 2013 16:48:05 -0000 1.7.2.18 +++ XMLPullParser.java 30 May 2013 13:36:45 -0000 1.7.2.19 @@ -34,7 +34,7 @@ * 3028518 2010-07-14 blaschke-oss Additional StringBuilder use * 3048749 2010-08-20 blaschke-oss Hex digit parsing logic error in XMLPullParser * 3304058 2011-05-20 blaschke-oss Use same date format in change history - * 2639 2013-05-11 blaschke-oss CDATA parsing broken in PULL parser + * 2639 2013-05-11 blaschke-oss CDATA parsing broken in PULL parser */ package org.sblim.cimclient.internal.pullparser; |
|
From: Dave B. <bla...@us...> - 2013-05-30 13:36:47
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5453/src/org/sblim/cimclient Modified Files: Tag: Experimental WBEMConfigurationProperties.java Log Message: Whitespace clean-up Index: WBEMConfigurationProperties.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMConfigurationProperties.java,v retrieving revision 1.17.2.39 retrieving revision 1.17.2.40 diff -u -d -r1.17.2.39 -r1.17.2.40 --- WBEMConfigurationProperties.java 21 May 2013 15:06:49 -0000 1.17.2.39 +++ WBEMConfigurationProperties.java 30 May 2013 13:36:45 -0000 1.17.2.40 @@ -46,7 +46,7 @@ * 2618 2013-02-27 blaschke-oss Need to add property to disable weak cipher suites for the secure indication * 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 - * 2642 2013-05-21 blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers + * 2642 2013-05-21 blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers */ package org.sblim.cimclient; |
|
From: Dave B. <bla...@us...> - 2013-05-30 13:18:20
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4897 Modified Files: NEWS Log Message: 2643 Update detailed release history HTML for 2.2.3 Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.355 retrieving revision 1.356 diff -u -d -r1.355 -r1.356 --- NEWS 30 May 2013 13:10:35 -0000 1.355 +++ NEWS 30 May 2013 13:18:18 -0000 1.356 @@ -1,5 +1,6 @@ Changes in HEAD ================ + 2643 Update detailed release history HTML for 2.2.3 2642 Seperate properties needed for cim client and listener to filter out ciphers 2635 Slowloris DoS attack for CIM indication listener port 2640 Multiple CDATA parsing broken in DOM parser |
|
From: Dave B. <bla...@us...> - 2013-05-30 13:10:37
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4631 Modified Files: NEWS sblim-cim-client2.properties Log Message: 2642 Seperate properties needed for cim client and listener to filter out ciphers Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.354 retrieving revision 1.355 diff -u -d -r1.354 -r1.355 --- NEWS 30 May 2013 12:25:24 -0000 1.354 +++ NEWS 30 May 2013 13:10:35 -0000 1.355 @@ -1,5 +1,6 @@ Changes in HEAD ================ + 2642 Seperate properties needed for cim client and listener to filter out ciphers 2635 Slowloris DoS attack for CIM indication listener port 2640 Multiple CDATA parsing broken in DOM parser 2639 CDATA parsing broken in PULL parser Index: sblim-cim-client2.properties =================================================================== RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.properties,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- sblim-cim-client2.properties 30 May 2013 12:25:24 -0000 1.35 +++ sblim-cim-client2.properties 30 May 2013 13:10:35 -0000 1.36 @@ -517,15 +517,27 @@ # #sblim.wbem.sslServerSocketProvider= -# The comma-separated list of cipher suites that are to be disabled when -# connecting via an SSL socket. In general, this is the list of cipher -# suites considered "too weak" for use in a particular environment. +# The comma-separated list of cipher suites that are to be disabled by +# the client when connecting via an SSL socket. In general, this is the +# list of cipher suites considered "too weak" for use in a particular +# environment. # # Type: String -# Recognition: On initialization of a new client/listener +# Recognition: On initialization of a new client # Default: none # -#sblim.wbem.sslCipherSuitesToDisable= +#sblim.wbem.sslClientCipherSuitesToDisable= + +# The comma-separated list of cipher suites that are to be disabled by +# the listener when connecting via an SSL socket. In general, this is +# the list of cipher suites considered "too weak" for use in a particular +# environment. +# +# Type: String +# Recognition: On next call to addListener() +# Default: none +# +#sblim.wbem.sslListenerCipherSuitesToDisable= # The protocol used for SSLContext.getInstance(String protocol). For IBMJSSE2 provider it can # be "SSL_TLS". |
|
From: Dave B. <bla...@us...> - 2013-05-30 12:25:27
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2472/src/org/sblim/cimclient Modified Files: 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.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- WBEMConfigurationProperties.java 8 May 2013 17:30:36 -0000 1.52 +++ WBEMConfigurationProperties.java 30 May 2013 12:25:24 -0000 1.53 @@ -45,6 +45,7 @@ * 3598613 2013-01-11 blaschke-oss different data type in cim instance and cim object path * 2618 2013-02-27 blaschke-oss Need to add property to disable weak cipher suites for the secure indication * 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 */ package org.sblim.cimclient; @@ -761,6 +762,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 indication * 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.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- WBEMListenerSBLIM.java 8 May 2013 17:30:36 -0000 1.22 +++ WBEMListenerSBLIM.java 30 May 2013 12:25:24 -0000 1.23 @@ -28,6 +28,7 @@ * 3529062 2012-05-23 blaschke-oss WBEMListenerFactory should return new instance * 3529065 2012-05-31 hellerda Enable WBEMListener get/setProperty * 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 */ package org.sblim.cimclient; @@ -71,6 +72,8 @@ private CIMIndicationHandler iIndicationHandler; + private HttpConnectionHandler iConnectionHandler; + /** * Ctor. * @@ -110,8 +113,9 @@ CIMEventDispatcher eventDispatcher = new CIMEventDispatcher(this.iIndicationListener, config.getListenerMaxQueuedEvents()); this.iIndicationHandler = new CIMIndicationHandler(eventDispatcher, config); - this.iConnection = new HttpServerConnection(new HttpConnectionHandler( - this.iIndicationHandler), pLocalAddress, pPort, pSSL, config); + this.iConnectionHandler = new HttpConnectionHandler(this.iIndicationHandler, config); + this.iConnection = new HttpServerConnection(this.iConnectionHandler, pLocalAddress, + pPort, pSSL, config); } @Override @@ -168,6 +172,26 @@ return this.iConnection.getPort(); } + /** + * Get the IPs blocked by the listener associated with the specified + * port. + * + * @return The comma-separated list of blocked IPs. + */ + public String getBlockedIPs() { + return this.iConnectionHandler.getBlockedIPs(); + } + + /** + * Set the IPs to be blocked by the listener associated with the + * specified port. + * + * @param pIPs + * The comma-separated list of blocked IPs. + */ + public void setBlockedIPs(String pIPs) { + this.iConnectionHandler.setBlockedIPs(pIPs); + } } protected final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties()); @@ -343,6 +367,20 @@ 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 String getProperty(String pName) { if (pName.startsWith("javax.wbem.")) { // Process JSR48 properties @@ -366,6 +404,24 @@ } } + /** + * 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); + } + } + public void setProperty(String pName, String pValue) { if (pName.startsWith("javax.wbem.")) { // Process JSR48 properties |
|
From: Dave B. <bla...@us...> - 2013-05-30 12:25:26
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2472/src/org/sblim/cimclient/internal/util Modified Files: 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.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- WBEMConfigurationDefaults.java 8 May 2013 17:30:35 -0000 1.34 +++ WBEMConfigurationDefaults.java 30 May 2013 12:25:24 -0000 1.35 @@ -39,6 +39,7 @@ * 3572993 2012-10-01 blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability * 3598613 2013-01-11 blaschke-oss different data type in cim instance and cim object path * 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 */ package org.sblim.cimclient.internal.util; @@ -230,6 +231,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.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- WBEMConstants.java 9 Mar 2013 11:31:01 -0000 1.16 +++ WBEMConstants.java 30 May 2013 12:25:24 -0000 1.17 @@ -25,6 +25,7 @@ * 2882448 2009-10-21 blaschke-oss Add WBEMClientConstants from JSR48 * 3525138 2012-05-09 blaschke-oss Remove WBEMConstants.PROTOCOL_CIMXML * 2619 2013-02-22 blaschke-oss Host should contain port when not 5988/5989 + * 2635 2013-05-16 blaschke-oss Slowloris DoS attack for CIM indication listener port */ package org.sblim.cimclient.internal.util; @@ -164,4 +165,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.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- WBEMConfiguration.java 8 May 2013 17:30:36 -0000 1.49 +++ WBEMConfiguration.java 30 May 2013 12:25:24 -0000 1.50 @@ -47,6 +47,7 @@ * 3598613 2013-01-11 blaschke-oss different data type in cim instance and cim object path * 2618 2013-02-27 blaschke-oss Need to add property to disable weak cipher suites for the secure indication * 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 */ package org.sblim.cimclient.internal.util; @@ -965,6 +966,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-05-30 12:09:11
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1956/src/org/sblim/cimclient/doc-files Modified Files: Tag: Experimental history.html Log Message: 2643 Update detailed release history HTML for 2.2.3 Index: history.html =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/history.html,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -d -r1.1.2.8 -r1.1.2.9 --- history.html 14 Mar 2013 19:48:32 -0000 1.1.2.8 +++ history.html 30 May 2013 12:09:08 -0000 1.1.2.9 @@ -24,6 +24,7 @@ * 3584119 2012-12-12 blaschke-oss Update detailed release history HTML for 2.2.1 * 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 --> </head> <body style="background-color: white;"> @@ -47,7 +48,7 @@ <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.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></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></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 @@ -58,6 +59,55 @@ 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="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> + <ul> + <li>A new Java property - sblim.wbem.listenerMaxQueuedEvents - + can be used to set the maximum number of queued events awaiting + dispatch to a listener. (#2628)</li> + <li>Two new Java properties - sblim.wbem.listenerHttpHeaderTimeout + and sblim.wbem.listenerHttpMaxAllowedTimeouts - can be used to help + prevent Denial of Service attacks on an indication listener via + the slowloris approach (#2635)</li> + <li>Two new private APIs - WBEMListenerSBLIM.getBlockedIPs and + setBlockedIPs can be used to control the IPs of incoming connections + that are to be ignored by an indication listener (#2635)</li> + <li>Two new Java properties - sblim.wbem.sslClientCipherSuitesToDisable + and sblim.wbem.sslListenerCipherSuitesToDisable - can be used to + disable a list of cipher suites when connecting via an SSL socket as + either a client or listener. (#2642)</li> + </ul> + <p>Version 2.2.3 also contains several changes that might affect existing + applications:</p> + <ul> + <li>The internal ChunkedInputStream constructors now require a second + parameter, a String representing the names of the trailer fields (from + HTTP Trailer header). (#2621)</li> + <li>The internal MessageReader constructor now requires a second + parameter, a long representing the HTTP header timeout (#2635)</li> + <li>The internal HttpConnectionHandler constructor now requires a + second parameter, a WBEMConfiguration representing the configuration + properties (#2635)</li> + <li>The Java property sblim.wbem.sslCipherSuitesToDisable has been + deleted, use sblim.wbem.sslClientCipherSuitesToDisable and/or + sblim.wbem.sslListenerCipherSuitesToDisable instead (#2642)</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/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> </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> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2638/">2638</a></td><td>Do not build empty REFERENCECLASS</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2639/">2639</a></td><td>CDATA parsing broken in PULL parser</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2640/">2640</a></td><td>Multiple CDATA parsing broken in DOM parser</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2635/">2635</a></td><td>Slowloris DoS attack for CIM indication listener port</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2642/">2642</a></td><td>Seperate properties needed for cim client and listener to filter out ciphers</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2643/">2643</a></td><td>Update detailed release history HTML for 2.2.3</td></tr> + </table> <a name="222"><h2>Version 2.2.2</h2></a> <p>Version 2.2.2 was released on March 15, 2013. It contains three new features:</p> @@ -69,7 +119,7 @@ <li>One new internal API - WBEMClientSBLIM.sendIndication - can be used to send a CIMInstance representing an indication to a specific URI. (#2616)</li> - <li>A new Java property - sblim.wbem.sslCipherSuitesToDisable = + <li>A new Java property - sblim.wbem.sslCipherSuitesToDisable - can be used to disable a list of cipher suites when connecting via an SSL socket. (#2618)</li> </ul> |
