Disable stunnel dns-caching

Make "delay = yes" a default stunnel option. Also permit non-root users to view
the help text again.

src/mount_efs/__init__.py

@@ -100,6 +100,7 @@ STUNNEL_EFS_CONFIG = {
     'renegotiation': 'no',
     'TIMEOUTbusy': '20',
     'libwrap': 'no',
+    'delay': 'yes',
 }
 
 WATCHDOG_SERVICE = 'amazon-efs-mount-watchdog'
@@ -188,8 +189,8 @@ def choose_tls_port(config):
             continue
 
     fatal_error('Failed to locate an available port in the range [%d, %d], '
-                'try specifying a different port range in efs-utils.conf'
-                % (lower_bound, upper_bound))
+                'try specifying a different port range in %s'
+                % (lower_bound, upper_bound, CONFIG_FILE))
 
 
 def get_mount_specific_filename(fs_id, mountpoint, tls_port):
@@ -466,15 +467,16 @@ def mount_nfs(dns_name, path, mountpoint, options):
         fatal_error(err.strip(), message, proc.returncode)
 
 
-def parse_arguments(config, args=None):
-    """Parse arguments, return (fsid, path, mountpoint, options)"""
+def usage(out, exit_code=1):
+    out.write('Usage: mount.efs [--version] [-h|--help] <fsname> <mountpoint> [-o <options>]\n')
+    sys.exit(exit_code)
+
+
+def parse_arguments_early_exit(args=None):
+    """Parse arguments, checking for early exit conditions only"""
     if args is None:
         args = sys.argv
 
-    def usage(out=sys.stderr, exit_code=1):
-        out.write('Usage: mount.efs [--version] [-h|--help] <fsname> <mountpoint> [-o <options>]\n')
-        sys.exit(exit_code)
-
     if '-h' in args[1:] or '--help' in args[1:]:
         usage(out=sys.stdout, exit_code=0)
 
@@ -482,6 +484,12 @@ def parse_arguments(config, args=None):
         sys.stdout.write('%s Version: %s\n' % (args[0], VERSION))
         sys.exit(0)
 
+
+def parse_arguments(config, args=None):
+    """Parse arguments, return (fsid, path, mountpoint, options)"""
+    if args is None:
+        args = sys.argv
+
     fsname = None
     mountpoint = None
     options = {}
@@ -494,7 +502,7 @@ def parse_arguments(config, args=None):
         options = parse_options(args[4])
 
     if not fsname or not mountpoint:
-        usage()
+        usage(out=sys.stderr)
 
     fs_id, path = match_device(config, fsname)
 
@@ -638,6 +646,8 @@ def check_unsupported_options(options):
 
 
 def main():
+    parse_arguments_early_exit()
+
     assert_root()
 
     config = read_config()

test/mount_efs_test/test_parse_arguments.py

@@ -13,7 +13,7 @@ import pytest
 
 def _test_parse_arguments_help(capsys, help):
     with pytest.raises(SystemExit) as ex:
-        mount_efs.parse_arguments(None, ['mount', 'foo', 'bar', help])
+        mount_efs.parse_arguments_early_exit(['mount', 'foo', 'bar', help])
 
     assert 0 == ex.value.code
 
@@ -31,7 +31,7 @@ def test_parse_arguments_help_short(capsys):
 
 def test_parse_arguments_version(capsys):
     with pytest.raises(SystemExit) as ex:
-        mount_efs.parse_arguments(None, ['mount', 'foo', 'bar', '--version'])
+        mount_efs.parse_arguments_early_exit(['mount', 'foo', 'bar', '--version'])
 
     assert 0 == ex.value.code
 
@@ -78,7 +78,8 @@ def test_parse_arguments_custom_path():
 
 
 def test_parse_arguments():
-    fsid, path, mountpoint, options = mount_efs.parse_arguments(None, ['mount', 'fs-deadbeef:/home', '/dir', '-o', 'foo,bar=baz,quux'])
+    fsid, path, mountpoint, options = mount_efs.parse_arguments(None,
+                                                                ['mount', 'fs-deadbeef:/home', '/dir', '-o', 'foo,bar=baz,quux'])
 
     assert 'fs-deadbeef' == fsid
     assert '/home' == path