Skip to content

Commit 5f0aa4b

Browse files
committed
Fix crash in conf parsing if ftps_pasv_ports value is not on the expected 'X:Y' format
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6130 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent f31b5a8 commit 5f0aa4b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

mig/shared/configuration.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,8 +1224,12 @@ def reload_config(self, verbose, skip_log=False, disable_auth_log=False):
12241224
'user_ftps_ctrl_port')
12251225
if config.has_option('GLOBAL', 'user_ftps_pasv_ports'):
12261226
text_range = config.get('GLOBAL', 'user_ftps_pasv_ports')
1227-
first, last = text_range.split(':')[:2]
1228-
self.user_ftps_pasv_ports = range(int(first), int(last))
1227+
parts = text_range.split(':', 2)
1228+
if parts[1:]:
1229+
self.user_ftps_pasv_ports = range(int(parts[0]), int(parts[1]))
1230+
else:
1231+
self.logger.warning("Ignore invalid user_ftps_pasv_ports: %s" %
1232+
text_range)
12291233
if config.has_option('GLOBAL', 'user_ftps_show_address'):
12301234
self.user_ftps_show_address = config.get('GLOBAL',
12311235
'user_ftps_show_address')

0 commit comments

Comments
 (0)