diff options
| -rw-r--r-- | libbe/command/html.py | 2 | ||||
| -rw-r--r-- | libbe/command/serve_commands.py | 5 | ||||
| -rw-r--r-- | libbe/util/wsgi.py | 17 |
3 files changed, 3 insertions, 21 deletions
diff --git a/libbe/command/html.py b/libbe/command/html.py index 5186417..3dfeb75 100644 --- a/libbe/command/html.py +++ b/libbe/command/html.py @@ -794,7 +794,6 @@ class HTML (libbe.util.wsgi.ServerCommand): if option.name not in [ 'read-only', 'notify', - 'auth', ]] self.options.extend([ @@ -854,7 +853,6 @@ class HTML (libbe.util.wsgi.ServerCommand): # provide defaults for the dropped options params['read-only'] = True params['notify'] = None - params['auth'] = None return super(HTML, self)._run(**params) def _get_app(self, logger, storage, index_file='', generation_time=None, diff --git a/libbe/command/serve_commands.py b/libbe/command/serve_commands.py index 30b4a69..7e8f57e 100644 --- a/libbe/command/serve_commands.py +++ b/libbe/command/serve_commands.py @@ -179,9 +179,8 @@ And in another terminal (or after backgrounding the server):: $ be --server http://localhost:8000/ list If you bind your server to a public interface, take a look at the -``--read-only`` option or the combined ``--ssl --auth FILE`` -options so other people can't mess with your repository. If you do use -authentication, you'll need to send in your username and password:: +``--read-only`` option so other people can't mess with your +repository. $ be --server http://username:password@localhost:8000/ list """ diff --git a/libbe/util/wsgi.py b/libbe/util/wsgi.py index dcddcf3..62b0428 100644 --- a/libbe/util/wsgi.py +++ b/libbe/util/wsgi.py @@ -631,15 +631,6 @@ class ServerCommand (libbe.command.base.Command): name='notify', metavar='EMAIL-COMMAND', default=None)), libbe.command.Option(name='ssl', short_name='s', help='Use CherryPy to serve HTTPS (HTTP over SSL/TLS)'), - libbe.command.Option(name='auth', short_name='a', - help=('Require authentication. FILE should be a file ' - 'containing colon-separated ' - 'UNAME:USER:sha1(PASSWORD) lines, for example: ' - '"jdoe:John Doe <jdoe@example.com>:' - 'd99f8e5a4b02dc25f49da2ea67c0034f61779e72"'), - arg=libbe.command.Argument( - name='auth', metavar='FILE', default=None, - completion_callback=libbe.command.util.complete_path)), ]) def _run(self, **params): @@ -655,15 +646,9 @@ class ServerCommand (libbe.command.base.Command): if params['read-only']: writeable = storage.writeable storage.writeable = False - if params['auth']: - self._check_restricted_access(storage, params['auth']) - users = Users(params['auth']) + users = Users() users.load() app = self._get_app(logger=self.logger, storage=storage, **params) - if params['auth']: - app = AdminApp(app, users=users, logger=self.logger) - app = AuthenticationApp(app, realm=storage.repo, - users=users, logger=self.logger) app = UppercaseHeaderApp(app, logger=self.logger) server,details = self._get_server(params, app) details['repo'] = storage.repo |