valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parted: fix _validate_partition_boundary

Browse Source 
The current partition boundary validator checks that one of the
valid units is a suffix of the boundary, and if so consider it
a valid one. This validation have two problems:

* We can miss the numerical part of the boundary

  e.g: 's' or 'MB' will be valid units

* The unit provided can be invalid

  e.g: '10as', '1okB'

The current validator make sure that there is a valid number
and a valid unit in the boundary.
This commit is contained in:
Alberto Planas 2018-09-27 14:20:50 +02:00
parent f98839c72d
commit 9e5a0fe676
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/parted.py
View File

@ -19,6 +19,7 @@ from __future__ import absolute_import, unicode_literals, print_function
# Import python libs
import os
import re
import stat
import string
import logging
@ -91,15 +92,15 @@ def _validate_partition_boundary(boundary):
'''
Ensure valid partition boundaries are supplied.
'''
try:
for unit in VALID_UNITS:
if six.text_type(boundary).endswith(unit):
return
int(boundary)
except Exception:
raise CommandExecutionError(
'Invalid partition boundary passed: "{0}"'.format(boundary)
)
boundary = six.text_type(boundary)
match = re.search(r'^([\d.]+)(\D*)$', boundary)
if match:
unit = match.group(2)
if not unit or unit in VALID_UNITS:
return
raise CommandExecutionError(
'Invalid partition boundary passed: "{0}"'.format(boundary)
)
def probe(*devices):