On Mon, Jun 14, 2010 at 2:19 PM, Michael Hanselmann <[email protected]> wrote:
> ---
> lib/utils.py | 26 ++++++++++++++++++++++++++
> test/ganeti.utils_unittest.py | 26 ++++++++++++++++++++++++++
> 2 files changed, 52 insertions(+), 0 deletions(-)
>
> diff --git a/lib/utils.py b/lib/utils.py
> index 49b5bc9..809489e 100644
> --- a/lib/utils.py
> +++ b/lib/utils.py
> @@ -81,6 +81,8 @@ X509_SIGNATURE =
> re.compile(r"^%s:\s*(?P<salt>%s+)/(?P<sign>%s+)$" %
> HEX_CHAR_RE, HEX_CHAR_RE),
> re.S | re.I)
>
> +_VALID_SERVICE_NAME_RE = re.compile("^[-_.a-zA-Z0-9]{1,128}$")
> +
> # Structure definition for getsockopt(SOL_SOCKET, SO_PEERCRED, ...):
> # struct ucred { pid_t pid; uid_t uid; gid_t gid; };
> #
> @@ -1155,6 +1157,30 @@ class HostInfo:
> return hostname
>
>
> +def ValidateServiceName(name):
> + """Validate the given service name.
> +
> + �...@type port: number or string
> + �...@param port: Port specification
s/port/name/
> +
> + """
> + try:
> + numport = int(name)
> + except (ValueError, TypeError):
> + # Non-numeric service name
> + valid = _VALID_SERVICE_NAME_RE.match(name)
> + else:
> + # Numeric port (protocols other than TCP or UDP might need adjustments
> + # here)
> + valid = (numport >= 0 and numport < (1 << 16))
> +
> + if not valid:
> + raise errors.OpPrereqError("Invalid service name '%s'" % name,
> + errors.ECODE_INVAL)
> +
> + return name
> +
> +
> def GetHostInfo(name=None):
> """Lookup host name and raise an OpPrereqError for failures"""
>
> diff --git a/test/ganeti.utils_unittest.py b/test/ganeti.utils_unittest.py
> index 9955d3b..f679341 100755
> --- a/test/ganeti.utils_unittest.py
> +++ b/test/ganeti.utils_unittest.py
> @@ -1903,6 +1903,32 @@ class TestHostInfo(unittest.TestCase):
> HostInfo.NormalizeName(value)
>
>
> +class TestValidateServiceName(unittest.TestCase):
> + def testValid(self):
> + testnames = [
> + 0, 1, 2, 3, 1024, 65000, 65534, 65535,
> + "ganeti",
> + "gnt-masterd",
> + "HELLO_WORLD_SVC",
> + "hello.world.1",
> + "0", "80", "1111", "65535",
> + ]
> +
> + for name in testnames:
> + self.assertEqual(utils.ValidateServiceName(name), name)
> +
> + def testInvalid(self):
> + testnames = [
> + -15756, -1, 65536, 133428083,
> + "", "Hello World!", "!", "'", "\"", "\t", "\n", "`",
> + "-8546", "-1", "65536",
> + (129 * "A"),
> + ]
> +
> + for name in testnames:
> + self.assertRaises(OpPrereqError, utils.ValidateServiceName, name)
> +
> +
> class TestParseAsn1Generalizedtime(unittest.TestCase):
> def test(self):
> # UTC
> --
> 1.7.0.4
Cheers, Manuel.
