version 1.83.4.1, 2003/03/11 19:56:55
|
version 1.91, 2003/08/06 14:53:21
|
|
|
return out; | return out; |
} | } |
| |
|
|
|
// l10n |
|
Array<Sint8>& operator<<(Array<Sint8>& out, const AcceptLanguages& al) |
|
{ |
|
XmlWriter::append(out, al.toString ()); |
|
return out; |
|
} |
|
|
|
// l10n |
|
Array<Sint8>& operator<<(Array<Sint8>& out, const ContentLanguages& cl) |
|
{ |
|
XmlWriter::append(out, cl.toString ()); |
|
return out; |
|
} |
|
|
|
|
PEGASUS_STD(ostream)& operator<<(PEGASUS_STD(ostream)& os, const CIMDateTime& x) | PEGASUS_STD(ostream)& operator<<(PEGASUS_STD(ostream)& os, const CIMDateTime& x) |
{ | { |
return os << x.toString(); | return os << x.toString(); |
|
|
{ | { |
// ATTN-B: Only UTF-8 handled for now. | // ATTN-B: Only UTF-8 handled for now. |
| |
|
if ( (c < Char16(0x20)) || (c == Char16(0x7f)) ) |
|
{ |
|
char charref[7]; |
|
sprintf(charref, "&#%u;", (Uint16)c); |
|
out.append(charref, strlen(charref)); |
|
} |
|
else |
|
{ |
switch (c) | switch (c) |
{ | { |
case '&': | case '&': |
|
|
out.append(Sint8(c)); | out.append(Sint8(c)); |
} | } |
} | } |
|
} |
| |
static inline void _appendSpecialChar(PEGASUS_STD(ostream)& os, char c) | static inline void _appendSpecialChar(PEGASUS_STD(ostream)& os, char c) |
{ | { |
|
if ( (c < Char16(0x20)) || (c == Char16(0x7f)) ) |
|
{ |
|
char charref[7]; |
|
sprintf(charref, "&#%u;", (Uint16)c); |
|
os << charref; |
|
} |
|
else |
|
{ |
switch (c) | switch (c) |
{ | { |
case '&': | case '&': |
|
|
os << c; | os << c; |
} | } |
} | } |
|
} |
| |
static inline void _appendSpecial(PEGASUS_STD(ostream)& os, const char* str) | static inline void _appendSpecial(PEGASUS_STD(ostream)& os, const char* str) |
{ | { |
|
|
void XmlWriter::append(Array<Sint8>& out, Uint64 x) | void XmlWriter::append(Array<Sint8>& out, Uint64 x) |
{ | { |
char buffer[32]; // Should need 21 chars max | char buffer[32]; // Should need 21 chars max |
// I know I shouldn't put platform flags here, but the other way is too hard |
sprintf(buffer, "%" PEGASUS_64BIT_CONVERSION_WIDTH "u", x); |
#if defined(PEGASUS_PLATFORM_WIN32_IX86_MSVC) |
|
sprintf(buffer, "%I64u", x); |
|
#else |
|
sprintf(buffer, "%llu", x); |
|
#endif |
|
append(out, buffer); | append(out, buffer); |
} | } |
| |
void XmlWriter::append(Array<Sint8>& out, Sint64 x) | void XmlWriter::append(Array<Sint8>& out, Sint64 x) |
{ | { |
char buffer[32]; // Should need 21 chars max | char buffer[32]; // Should need 21 chars max |
// I know I shouldn't put platform flags here, but the other way is too hard |
sprintf(buffer, "%" PEGASUS_64BIT_CONVERSION_WIDTH "d", x); |
#if defined(PEGASUS_PLATFORM_WIN32_IX86_MSVC) |
|
sprintf(buffer, "%I64d", x); |
|
#else |
|
sprintf(buffer, "%lld", x); |
|
#endif |
|
append(out, buffer); | append(out, buffer); |
} | } |
| |
|
|
// ATTN: Handle non-UTF-8 character sets | // ATTN: Handle non-UTF-8 character sets |
char c = char16 & 0x007f; | char c = char16 & 0x007f; |
| |
#if 0 |
#ifndef PEGASUS_DO_NOT_IMPLEMENT_URI_ENCODING |
// Enable this functionality when approved by Pegasus community |
|
//#ifndef PEGASUS_DO_NOT_IMPLEMENT_URI_ENCODING |
|
if ( (c <= 0x20) || // Control characters + space char | if ( (c <= 0x20) || // Control characters + space char |
( (c >= 0x22) && (c <= 0x26) ) || // '"' '#' '$' '%' '&' | ( (c >= 0x22) && (c <= 0x26) ) || // '"' '#' '$' '%' '&' |
(c == 0x2b) || // '+' | (c == 0x2b) || // '+' |
|
|
out << "<LOCALNAMESPACEPATH>\n"; | out << "<LOCALNAMESPACEPATH>\n"; |
| |
char* nameSpaceCopy = strdup(nameSpace.getString().getCString()); | char* nameSpaceCopy = strdup(nameSpace.getString().getCString()); |
|
#ifdef PEGASUS_PLATFORM_SOLARIS_SPARC_CC |
|
char *last; |
|
for (const char* p = strtok_r(nameSpaceCopy, "/", &last); p; |
|
p = strtok_r(NULL, "/", &last)) |
|
#else |
for (const char* p = strtok(nameSpaceCopy, "/"); p; p = strtok(NULL, "/")) | for (const char* p = strtok(nameSpaceCopy, "/"); p; p = strtok(NULL, "/")) |
|
#endif |
{ | { |
out << "<NAMESPACE NAME=\"" << p << "\"/>\n"; | out << "<NAMESPACE NAME=\"" << p << "\"/>\n"; |
} | } |
|
|
} | } |
} | } |
| |
|
// l10n - added content language and accept language support to |
|
// the header methods below |
|
|
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// appendMethodCallHeader() | // appendMethodCallHeader() |
|
|
const String& cimObject, | const String& cimObject, |
const String& authenticationHeader, | const String& authenticationHeader, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
|
const AcceptLanguages & acceptLanguages, |
|
const ContentLanguages & contentLanguages, |
Uint32 contentLength) | Uint32 contentLength) |
{ | { |
char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' }; | char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' }; |
|
|
// do that in client today. Permanent change is to retry until spec | // do that in client today. Permanent change is to retry until spec |
// updated. This change is temp to finish tests or until the retry | // updated. This change is temp to finish tests or until the retry |
// installed. Required because of change to wbemservices cimom | // installed. Required because of change to wbemservices cimom |
#ifdef PEGASUS_SNIA_INTEROP_TEST |
#if defined PEGASUS_SNIA_INTEROP_TEST || defined PEGASUS_FORCE_POST_METHOD |
out << "POST /cimom HTTP/1.1\r\n"; | out << "POST /cimom HTTP/1.1\r\n"; |
#else | #else |
if (httpMethod == HTTP_METHOD_M_POST) | if (httpMethod == HTTP_METHOD_M_POST) |
|
|
out << "HOST: " << host << "\r\n"; | out << "HOST: " << host << "\r\n"; |
out << "Content-Type: application/xml; charset=\"utf-8\"\r\n"; | out << "Content-Type: application/xml; charset=\"utf-8\"\r\n"; |
out << "Content-Length: " << contentLength << "\r\n"; | out << "Content-Length: " << contentLength << "\r\n"; |
|
if (acceptLanguages.size() > 0) |
|
{ |
|
out << "Accept-Language: " << acceptLanguages << "\r\n"; |
|
} |
|
if (contentLanguages.size() > 0) |
|
{ |
|
out << "Content-Language: " << contentLanguages << "\r\n"; |
|
} |
if (httpMethod == HTTP_METHOD_M_POST) | if (httpMethod == HTTP_METHOD_M_POST) |
{ | { |
out << "Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns="; | out << "Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns="; |
|
|
out << "\r\n"; | out << "\r\n"; |
} | } |
| |
|
|
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// appendMethodResponseHeader() | // appendMethodResponseHeader() |
|
|
void XmlWriter::appendMethodResponseHeader( | void XmlWriter::appendMethodResponseHeader( |
Array<Sint8>& out, | Array<Sint8>& out, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
|
const ContentLanguages & contentLanguages, |
Uint32 contentLength) | Uint32 contentLength) |
{ | { |
char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' }; | char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' }; |
|
|
STAT_SERVERTIME | STAT_SERVERTIME |
out << "Content-Type: application/xml; charset=\"utf-8\"\r\n"; | out << "Content-Type: application/xml; charset=\"utf-8\"\r\n"; |
out << "Content-Length: " << contentLength << "\r\n"; | out << "Content-Length: " << contentLength << "\r\n"; |
|
if (contentLanguages.size() > 0) |
|
{ |
|
out << "Content-Language: " << contentLanguages << "\r\n"; |
|
} |
if (httpMethod == HTTP_METHOD_M_POST) | if (httpMethod == HTTP_METHOD_M_POST) |
{ | { |
out << "Ext:\r\n"; | out << "Ext:\r\n"; |
|
|
// out << "</BODY></HTML>\r\n"; | // out << "</BODY></HTML>\r\n"; |
} | } |
| |
|
#ifdef PEGASUS_KERBEROS_AUTHENTICATION |
|
//------------------------------------------------------------------------------ |
|
// |
|
// appendOKResponseHeader() |
|
// |
|
// Build HTTP authentication response header for unauthorized requests. |
|
// |
|
// Returns OK message in the following format: |
|
// |
|
// HTTP/1.1 200 OK |
|
// WWW-Authenticate: Negotiate "token" |
|
// <HTML><HEAD> |
|
// <TITLE>200 OK</TITLE> |
|
// </HEAD><BODY BGCOLOR="#99cc99"> |
|
// <H2>TEST200 OK</H2> |
|
// <HR> |
|
// </BODY></HTML> |
|
// |
|
//------------------------------------------------------------------------------ |
|
|
|
void XmlWriter::appendOKResponseHeader( |
|
Array<Sint8>& out, |
|
const String& content) |
|
{ |
|
out << "HTTP/1.1 " HTTP_STATUS_OK "\r\n"; |
|
out << content << "\r\n"; |
|
out << "\r\n"; |
|
|
|
//ATTN: We may need to include the following line, so that the browsers |
|
// can display the error message. |
|
// out << "<HTML><HEAD>\r\n"; |
|
// out << "<TITLE>" << "200 OK" << "</TITLE>\r\n"; |
|
// out << "</HEAD><BODY BGCOLOR=\"#99cc99\">\r\n"; |
|
// out << "<H2>TEST" << "200 OK" << "</H2>\r\n"; |
|
// out << "<HR>\r\n"; |
|
// out << "</BODY></HTML>\r\n"; |
|
} |
|
#endif |
|
|
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// _appendMessageElementBegin() | // _appendMessageElementBegin() |
|
|
return out; | return out; |
} | } |
| |
|
// l10n - add content language support to the format methods below |
|
|
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
// | // |
// XmlWriter::formatSimpleMethodReqMessage() | // XmlWriter::formatSimpleMethodReqMessage() |
|
|
const Array<CIMParamValue>& parameters, | const Array<CIMParamValue>& parameters, |
const String& messageId, | const String& messageId, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
const String& authenticationHeader) |
const String& authenticationHeader, |
|
const AcceptLanguages& httpAcceptLanguages, |
|
const ContentLanguages& httpContentLanguages) |
{ | { |
Array<Sint8> out; | Array<Sint8> out; |
Array<Sint8> tmp; | Array<Sint8> tmp; |
|
|
localObjectPath.toString(), | localObjectPath.toString(), |
authenticationHeader, | authenticationHeader, |
httpMethod, | httpMethod, |
|
httpAcceptLanguages, |
|
httpContentLanguages, |
out.size()); | out.size()); |
tmp << out; | tmp << out; |
| |
|
|
const CIMName& methodName, | const CIMName& methodName, |
const String& messageId, | const String& messageId, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
|
const ContentLanguages & httpContentLanguages, |
const Array<Sint8>& body) | const Array<Sint8>& body) |
{ | { |
Array<Sint8> out; | Array<Sint8> out; |
|
|
_appendSimpleRspElementEnd(out); | _appendSimpleRspElementEnd(out); |
_appendMessageElementEnd(out); | _appendMessageElementEnd(out); |
| |
appendMethodResponseHeader(tmp, httpMethod, out.size()); |
appendMethodResponseHeader(tmp, |
|
httpMethod, |
|
httpContentLanguages, |
|
out.size()); |
tmp << out; | tmp << out; |
| |
return tmp; | return tmp; |
|
|
_appendSimpleRspElementEnd(out); | _appendSimpleRspElementEnd(out); |
_appendMessageElementEnd(out); | _appendMessageElementEnd(out); |
| |
appendMethodResponseHeader(tmp, httpMethod, out.size()); |
// l10n |
|
appendMethodResponseHeader(tmp, |
|
httpMethod, |
|
cimException.getContentLanguages(), |
|
out.size()); |
tmp << out; | tmp << out; |
| |
return tmp; | return tmp; |
|
|
const String& messageId, | const String& messageId, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
const String& authenticationHeader, | const String& authenticationHeader, |
|
const AcceptLanguages& httpAcceptLanguages, |
|
const ContentLanguages& httpContentLanguages, |
const Array<Sint8>& body) | const Array<Sint8>& body) |
{ | { |
Array<Sint8> out; | Array<Sint8> out; |
|
|
nameSpace.getString(), | nameSpace.getString(), |
authenticationHeader, | authenticationHeader, |
httpMethod, | httpMethod, |
|
httpAcceptLanguages, |
|
httpContentLanguages, |
out.size()); | out.size()); |
tmp << out; | tmp << out; |
| |
|
|
const CIMName& iMethodName, | const CIMName& iMethodName, |
const String& messageId, | const String& messageId, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
|
const ContentLanguages & httpContentLanguages, |
const Array<Sint8>& body) | const Array<Sint8>& body) |
{ | { |
Array<Sint8> out; | Array<Sint8> out; |
|
|
_appendSimpleRspElementEnd(out); | _appendSimpleRspElementEnd(out); |
_appendMessageElementEnd(out); | _appendMessageElementEnd(out); |
| |
appendMethodResponseHeader(tmp, httpMethod, out.size()); |
appendMethodResponseHeader(tmp, |
|
httpMethod, |
|
httpContentLanguages, |
|
out.size()); |
tmp << out; | tmp << out; |
| |
return tmp; | return tmp; |
|
|
_appendSimpleRspElementEnd(out); | _appendSimpleRspElementEnd(out); |
_appendMessageElementEnd(out); | _appendMessageElementEnd(out); |
| |
appendMethodResponseHeader(tmp, httpMethod, out.size()); |
// l10n |
|
appendMethodResponseHeader(tmp, |
|
httpMethod, |
|
cimException.getContentLanguages(), |
|
out.size()); |
tmp << out; | tmp << out; |
| |
return tmp; | return tmp; |
|
|
const CIMName& cimMethod, | const CIMName& cimMethod, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
const String& authenticationHeader, | const String& authenticationHeader, |
|
const AcceptLanguages& acceptLanguages, |
|
const ContentLanguages& contentLanguages, |
Uint32 contentLength) | Uint32 contentLength) |
{ | { |
char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' }; | char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' }; |
|
|
out << "HOST: " << host << "\r\n"; | out << "HOST: " << host << "\r\n"; |
out << "Content-Type: application/xml; charset=\"utf-8\"\r\n"; | out << "Content-Type: application/xml; charset=\"utf-8\"\r\n"; |
out << "Content-Length: " << contentLength << "\r\n"; | out << "Content-Length: " << contentLength << "\r\n"; |
|
if (acceptLanguages.size() > 0) |
|
{ |
|
out << "Accept-Language: " << acceptLanguages << "\r\n"; |
|
} |
|
if (contentLanguages.size() > 0) |
|
{ |
|
out << "Content-Language: " << contentLanguages << "\r\n"; |
|
} |
if (httpMethod == HTTP_METHOD_M_POST) | if (httpMethod == HTTP_METHOD_M_POST) |
{ | { |
out << "Man: http://www.hp.com; ns="; | out << "Man: http://www.hp.com; ns="; |
|
|
void XmlWriter::appendEMethodResponseHeader( | void XmlWriter::appendEMethodResponseHeader( |
Array<Sint8>& out, | Array<Sint8>& out, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
|
const ContentLanguages& contentLanguages, |
Uint32 contentLength) | Uint32 contentLength) |
{ | { |
char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' }; | char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' }; |
|
|
out << "HTTP/1.1 " HTTP_STATUS_OK "\r\n"; | out << "HTTP/1.1 " HTTP_STATUS_OK "\r\n"; |
out << "Content-Type: application/xml; charset=\"utf-8\"\r\n"; | out << "Content-Type: application/xml; charset=\"utf-8\"\r\n"; |
out << "Content-Length: " << contentLength << "\r\n"; | out << "Content-Length: " << contentLength << "\r\n"; |
|
if (contentLanguages.size() > 0) |
|
{ |
|
out << "Content-Language: " << contentLanguages << "\r\n"; |
|
} |
if (httpMethod == HTTP_METHOD_M_POST) | if (httpMethod == HTTP_METHOD_M_POST) |
{ | { |
out << "Ext:\r\n"; | out << "Ext:\r\n"; |
|
|
const String& messageId, | const String& messageId, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
const String& authenticationHeader, | const String& authenticationHeader, |
|
const AcceptLanguages& httpAcceptLanguages, |
|
const ContentLanguages& httpContentLanguages, |
const Array<Sint8>& body) | const Array<Sint8>& body) |
{ | { |
Array<Sint8> out; | Array<Sint8> out; |
|
|
eMethodName, | eMethodName, |
httpMethod, | httpMethod, |
authenticationHeader, | authenticationHeader, |
|
httpAcceptLanguages, |
|
httpContentLanguages, |
out.size()); | out.size()); |
tmp << out; | tmp << out; |
| |
|
|
const CIMName& eMethodName, | const CIMName& eMethodName, |
const String& messageId, | const String& messageId, |
HttpMethod httpMethod, | HttpMethod httpMethod, |
|
const ContentLanguages& httpContentLanguages, |
const Array<Sint8>& body) | const Array<Sint8>& body) |
{ | { |
Array<Sint8> out; | Array<Sint8> out; |
|
|
_appendSimpleExportRspElementEnd(out); | _appendSimpleExportRspElementEnd(out); |
_appendMessageElementEnd(out); | _appendMessageElementEnd(out); |
| |
appendEMethodResponseHeader(tmp, httpMethod, out.size()); |
appendEMethodResponseHeader(tmp, |
|
httpMethod, |
|
httpContentLanguages, |
|
out.size()); |
tmp << out; | tmp << out; |
| |
return tmp; | return tmp; |
|
|
_appendSimpleExportRspElementEnd(out); | _appendSimpleExportRspElementEnd(out); |
_appendMessageElementEnd(out); | _appendMessageElementEnd(out); |
| |
appendEMethodResponseHeader(tmp, httpMethod, out.size()); |
// l10n |
|
appendEMethodResponseHeader(tmp, |
|
httpMethod, |
|
cimException.getContentLanguages(), |
|
out.size()); |
tmp << out; | tmp << out; |
| |
return tmp; | return tmp; |