|
version 1.41.2.1, 2004/11/12 17:48:28
|
version 1.49, 2005/04/04 06:37:19
|
|
|
|
| //%2003//////////////////////////////////////////////////////////////////////// |
//%2005//////////////////////////////////////////////////////////////////////// |
| // | // |
| // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Development |
// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development |
| // Company, L. P., IBM Corp., The Open Group, Tivoli Systems. |
// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. |
| // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.; | // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.; |
| // IBM Corp.; EMC Corporation, The Open Group. | // IBM Corp.; EMC Corporation, The Open Group. |
| |
// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; |
| |
// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. |
| |
// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; |
| |
// EMC Corporation; VERITAS Software Corporation; The Open Group. |
| // | // |
| // Permission is hereby granted, free of charge, to any person obtaining a copy | // Permission is hereby granted, free of charge, to any person obtaining a copy |
| // of this software and associated documentation files (the "Software"), to | // of this software and associated documentation files (the "Software"), to |
|
|
|
| // Modified By: Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com) | // Modified By: Roger Kumpf, Hewlett-Packard Company (roger_kumpf@hp.com) |
| // Carol Ann Krug Graves, Hewlett-Packard Company | // Carol Ann Krug Graves, Hewlett-Packard Company |
| // (carolann_graves@hp.com) | // (carolann_graves@hp.com) |
| |
// Dave Sudlik, IBM (dsudlik@us.ibm.com) |
| // | // |
| //%///////////////////////////////////////////////////////////////////////////// | //%///////////////////////////////////////////////////////////////////////////// |
| | |
| #include <Pegasus/Common/Config.h> | #include <Pegasus/Common/Config.h> |
| #include <cctype> |
|
| #include <cstring> | #include <cstring> |
| #include <iostream> | #include <iostream> |
| #include "HashTable.h" | #include "HashTable.h" |
| #include "CIMObjectPath.h" | #include "CIMObjectPath.h" |
| #include "Indentor.h" | #include "Indentor.h" |
| #include "CIMName.h" | #include "CIMName.h" |
| #include "Destroyer.h" |
|
| #include "XmlWriter.h" | #include "XmlWriter.h" |
| #include "XmlReader.h" | #include "XmlReader.h" |
| #include "ArrayInternal.h" | #include "ArrayInternal.h" |
|
|
|
| case CIMTYPE_REFERENCE: | case CIMTYPE_REFERENCE: |
| kbType = REFERENCE; | kbType = REFERENCE; |
| break; | break; |
| |
// case CIMTYPE_REAL32: |
| |
// case CIMTYPE_REAL64: |
| case CIMTYPE_OBJECT: | case CIMTYPE_OBJECT: |
| |
// From PEP 194: EmbeddedObjects cannot be keys. |
| throw TypeMismatchException(); | throw TypeMismatchException(); |
| // From PEP 194: |
|
| // Open Issue for the DMTF: Are EmbeddedObject properties permitted to be keys? |
|
| break; | break; |
| default: | default: |
| kbType = NUMERIC; | kbType = NUMERIC; |
|
|
|
| kbValue = XmlReader::stringToValue(0, getValue().getCString(), | kbValue = XmlReader::stringToValue(0, getValue().getCString(), |
| value.getType()); | value.getType()); |
| break; | break; |
| |
// case CIMTYPE_REAL32: |
| |
// case CIMTYPE_REAL64: |
| case CIMTYPE_OBJECT: | case CIMTYPE_OBJECT: |
| |
// From PEP 194: EmbeddedObjects cannot be keys. |
| return false; | return false; |
| // From PEP 194: |
|
| // Open Issue for the DMTF: Are EmbeddedObject properties permitted to be keys? |
|
| break; | break; |
| default: // Numerics | default: // Numerics |
| if (getType() != NUMERIC) return false; | if (getType() != NUMERIC) return false; |
|
|
|
| // fully-qualified domain name (e.g., xyz.company.com) or may be an | // fully-qualified domain name (e.g., xyz.company.com) or may be an |
| // IP address. A port number may follow the hostname. | // IP address. A port number may follow the hostname. |
| // Hostnames must match one of the following regular expressions: | // Hostnames must match one of the following regular expressions: |
| // ^([A-Za-z][A-Za-z0-9-]*)(\.[A-Za-z][A-Za-z0-9-]*)*(:[0-9]*)?$ |
// ^([A-Za-z0-9][A-Za-z0-9-]*)(\.[A-Za-z][A-Za-z0-9-]*)*(:[0-9]*)?$ |
| // ^([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*)(:[0-9]*)?$ | // ^([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*)(:[0-9]*)?$ |
| |
// Note for Bug#1462. Be careful here, from RFC 1123: |
| |
// - The syntax of a legal Internet host name was specified in |
| |
// RFC-952 [DNS:4]. One aspect of host name syntax is hereby |
| |
// changed: the restriction on the first character is relaxed to |
| |
// allow either a letter or a digit. |
| |
// - If a dotted-decimal number can be entered without identifying |
| |
// delimiters, then a full syntactic check must be made, because |
| |
// a segment of a host domain name is now allowed to begin with a |
| |
// digit and could legally be entirely numeric (see Section 6.1.2.4). |
| |
// However, a valid host name can never have the dotted-decimal form |
| |
// #.#.#.#, since at least the highest-level component label will be |
| |
// alphabetic. |
| |
// The algorithm below has been updated accordingly. |
| //------------------------------------------------------------------ | //------------------------------------------------------------------ |
| | |
| Uint32 i = 0; | Uint32 i = 0; |
| | |
| if (isdigit(hostname[0])) |
Boolean isValid = false; |
| |
|
| |
if (hostname[0].isDigit()) |
| { | { |
| // Validate an IP address |
//-------------------------------------------------------------- |
| |
// Attempt to validate an IP address, but keep in mind that it |
| |
// might be a host name, since the leading character can now be |
| |
// a digit. |
| |
//-------------------------------------------------------------- |
| |
isValid = true; |
| | |
| for (Uint32 octet=1; octet<=4; octet++) | for (Uint32 octet=1; octet<=4; octet++) |
| { | { |
| Uint32 octetValue = 0; | Uint32 octetValue = 0; |
| | |
| if (!isdigit(hostname[i])) |
//---------------------------------------------------------- |
| |
// If a non-digit is encountered in the input parameter, |
| |
// then break from here and attempt to validate as host name. |
| |
//---------------------------------------------------------- |
| |
if (!hostname[i].isDigit()) |
| { | { |
| return false; |
isValid = false; |
| |
break; |
| } | } |
| | |
| while (isdigit(hostname[i])) |
while (hostname[i].isDigit()) // skip over digits |
| { | { |
| octetValue = octetValue*10 + (hostname[i] - '0'); | octetValue = octetValue*10 + (hostname[i] - '0'); |
| i++; | i++; |
|
|
|
| | |
| if (octetValue > 255) | if (octetValue > 255) |
| { | { |
| return false; |
isValid = false; |
| |
break; |
| } | } |
| | |
| |
// Check for invalid character in IP address |
| if ((octet != 4) && (hostname[i++] != '.')) | if ((octet != 4) && (hostname[i++] != '.')) |
| { | { |
| return false; |
isValid = false; |
| |
break; |
| |
} |
| |
|
| |
// Check for the case where it's a valid host name that happens |
| |
// to have 4 (or more) leading all-numeric host segments. |
| |
if ((octet == 4) && (hostname[i] != ':') && hostname[i] != char(0)) |
| |
{ |
| |
isValid = false; |
| |
break; |
| } | } |
| } | } |
| } | } |
| else |
if (!isValid) // if it is not a valid IP address |
| { | { |
| |
i = 0; // reset index for host name check |
| |
|
| // Validate a hostname | // Validate a hostname |
| |
isValid = true; |
| | |
| Boolean expectHostSegment = true; | Boolean expectHostSegment = true; |
| |
Boolean hostSegmentIsNumeric; |
| | |
| while (expectHostSegment == true) | while (expectHostSegment == true) |
| { | { |
| expectHostSegment = false; | expectHostSegment = false; |
| |
hostSegmentIsNumeric = true; // assume all-numeric host segment |
| | |
| if (!isalpha(hostname[i++])) |
if (!hostname[i].isAlnum()) |
| { | { |
| return false; | return false; |
| } | } |
| | |
| while (isalnum(hostname[i]) || (hostname[i] == '-')) |
while (hostname[i].isAlnum() || (hostname[i] == '-')) |
| { | { |
| |
// If a non-digit is encountered, set "all-numeric" |
| |
// flag to false |
| |
if (hostname[i].isAlpha() || (hostname[i] == '-')) { |
| |
hostSegmentIsNumeric = false; |
| |
} |
| i++; | i++; |
| } | } |
| | |
|
|
|
| expectHostSegment = true; | expectHostSegment = true; |
| } | } |
| } | } |
| |
// If the last Host Segment is all numeric, then return false. |
| |
// RFC 1123 says "highest-level component label will be alphabetic". |
| |
if (hostSegmentIsNumeric) { |
| |
return false; |
| |
} |
| |
} |
| |
|
| |
if (!isValid) // if not a valid IP address or host name |
| |
{ |
| |
return false; |
| } | } |
| | |
| // Check for a port number: | // Check for a port number: |
| | |
| if (hostname[i] == ':') | if (hostname[i] == ':') |
| { | { |
| if (!isdigit(hostname[++i])) |
if (!hostname[++i].isDigit()) |
| { | { |
| return false; | return false; |
| } | } |
| | |
| while (isdigit(hostname[++i])); |
while (hostname[++i].isDigit()); |
| } | } |
| | |
| return (hostname[i] == char(0)); | return (hostname[i] == char(0)); |
Return to
CIMObjectPath.cpp
CVS log
Up to [Pegasus] / pegasus / src / Pegasus / Common