uploadserver 6.0.0__tar.gz → 6.0.2__tar.gz

{uploadserver-6.0.0/uploadserver.egg-info → uploadserver-6.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: uploadserver
-Version: 6.0.0
+Version: 6.0.2
 Summary: Python's http.server extended to include a file upload page
 Home-page: https://github.com/Densaugeo/uploadserver
 Author: Densaugeo
@@ -11,6 +11,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 # uploadserver
 
@@ -32,13 +41,13 @@ Python's http.server extended to include a file upload page
 
 ## Installation
 
-~~~
+~~~bash
 python3 -m pip install --user uploadserver
 ~~~
 
 ## Usage
 
-~~~
+~~~bash
 python3 -m uploadserver
 ~~~
 
@@ -49,18 +58,18 @@ After the server starts, the upload page is at /upload. For example, if the serv
 Warning: This is an upload server, and running it will allow uploads.
 
 Now supports uploading multiple files at once! Select multiple files in the web page's file selector, or upload with cURL:
-~~~
+~~~bash
 curl -X POST http://127.0.0.1:8000/upload -F 'files=@multiple-example-1.txt' -F 'files=@multiple-example-2.txt'
 ~~~
 
 ## Basic Authentication (downloads and uploads)
 
-~~~
+~~~bash
 python3 -m uploadserver --basic-auth hello:world
 ~~~
 
 Now you can upload with basic authentication. For example:
-~~~
+~~~bash
 curl -X POST http://127.0.0.1:8000/upload -F 'files=@basicauth-example.txt' -u hello:world
 ~~~
 
@@ -68,7 +77,7 @@ All requests without authentication will be rejected. Note that basic authentica
 
 ## Basic Authentication (uploads only)
 
-~~~
+~~~bash
 python3 -m uploadserver --basic-auth-upload hello:world
 ~~~
 
@@ -79,18 +88,18 @@ If both `--basic-auth` and `--basic-auth-upload` are specified, all requests wil
 ## Theme Option
 
 The upload page supports a dark mode for showing white text on black background. If no option is specified, the color scheme is chosen from the client’s browser’s preference (which typically matches their operating system’s setting, if light or dark mode is supported by the OS). To enforce the light or dark theme, the CLI parameter `--theme` can be used:
-~~~
+~~~bash
 python3 -m uploadserver --theme light
 ~~~
 or
-~~~
+~~~bash
 python3 -m uploadserver --theme dark
 ~~~
 
 ## HTTPS Option
 
 Run with HTTPS and without client authentication:
-~~~
+~~~bash
 # Generate self-signed server certificate
 openssl req -x509 -out server.pem -keyout server.pem -newkey rsa:2048 -nodes -sha256 -subj '/CN=server'
 
@@ -103,7 +112,7 @@ curl -X POST https://localhost:8000/upload --insecure -F files=@simple-example.t
 ~~~
 
 Run with HTTPS and with client authentication:
-~~~
+~~~bash
 # Generate self-signed server certificate
 openssl req -x509 -out server.pem -keyout server.pem -newkey rsa:2048 -nodes -sha256 -subj '/CN=server'
 
@@ -207,3 +216,5 @@ Thanks to marvinruder for work on the upload progress indicator, theme option, a
 Thanks to shuangye for finding an easy way to handle large file uploads, and improved handling of filename collisions.
 
 Thanks to abbbe for adding HTTP basic auth (has now replaced the token option).
+
+Thanks to SimarMugattarov, theo543, and poshul for minor updates.

{uploadserver-6.0.0 → uploadserver-6.0.2}/README.md

@@ -18,13 +18,13 @@ Python's http.server extended to include a file upload page
 
 ## Installation
 
-~~~
+~~~bash
 python3 -m pip install --user uploadserver
 ~~~
 
 ## Usage
 
-~~~
+~~~bash
 python3 -m uploadserver
 ~~~
 
@@ -35,18 +35,18 @@ After the server starts, the upload page is at /upload. For example, if the serv
 Warning: This is an upload server, and running it will allow uploads.
 
 Now supports uploading multiple files at once! Select multiple files in the web page's file selector, or upload with cURL:
-~~~
+~~~bash
 curl -X POST http://127.0.0.1:8000/upload -F 'files=@multiple-example-1.txt' -F 'files=@multiple-example-2.txt'
 ~~~
 
 ## Basic Authentication (downloads and uploads)
 
-~~~
+~~~bash
 python3 -m uploadserver --basic-auth hello:world
 ~~~
 
 Now you can upload with basic authentication. For example:
-~~~
+~~~bash
 curl -X POST http://127.0.0.1:8000/upload -F 'files=@basicauth-example.txt' -u hello:world
 ~~~
 
@@ -54,7 +54,7 @@ All requests without authentication will be rejected. Note that basic authentica
 
 ## Basic Authentication (uploads only)
 
-~~~
+~~~bash
 python3 -m uploadserver --basic-auth-upload hello:world
 ~~~
 
@@ -65,18 +65,18 @@ If both `--basic-auth` and `--basic-auth-upload` are specified, all requests wil
 ## Theme Option
 
 The upload page supports a dark mode for showing white text on black background. If no option is specified, the color scheme is chosen from the client’s browser’s preference (which typically matches their operating system’s setting, if light or dark mode is supported by the OS). To enforce the light or dark theme, the CLI parameter `--theme` can be used:
-~~~
+~~~bash
 python3 -m uploadserver --theme light
 ~~~
 or
-~~~
+~~~bash
 python3 -m uploadserver --theme dark
 ~~~
 
 ## HTTPS Option
 
 Run with HTTPS and without client authentication:
-~~~
+~~~bash
 # Generate self-signed server certificate
 openssl req -x509 -out server.pem -keyout server.pem -newkey rsa:2048 -nodes -sha256 -subj '/CN=server'
 
@@ -89,7 +89,7 @@ curl -X POST https://localhost:8000/upload --insecure -F files=@simple-example.t
 ~~~
 
 Run with HTTPS and with client authentication:
-~~~
+~~~bash
 # Generate self-signed server certificate
 openssl req -x509 -out server.pem -keyout server.pem -newkey rsa:2048 -nodes -sha256 -subj '/CN=server'
 
@@ -193,3 +193,5 @@ Thanks to marvinruder for work on the upload progress indicator, theme option, a
 Thanks to shuangye for finding an easy way to handle large file uploads, and improved handling of filename collisions.
 
 Thanks to abbbe for adding HTTP basic auth (has now replaced the token option).
+
+Thanks to SimarMugattarov, theo543, and poshul for minor updates.

{uploadserver-6.0.0 → uploadserver-6.0.2}/setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as fh:
 
 setuptools.setup(
     name='uploadserver',
-    version='6.0.0',
+    version='6.0.2',
     author='Densaugeo',
     author_email='author@example.com',
     description='Python\'s http.server extended to include a file upload page',

{uploadserver-6.0.0 → uploadserver-6.0.2}/uploadserver/__init__.py

@@ -1,4 +1,5 @@
 import http.server, http, pathlib, sys, argparse, ssl, os, builtins, tempfile
+import ipaddress
 import base64, binascii, functools, contextlib
 
 # Does not seem to do be used, but leaving this import out causes uploadserver
@@ -185,8 +186,8 @@ handler: http.server.BaseHTTPRequestHandler, auth: str,
     except binascii.Error:
         return (False, 'Credentials incorrectly formatted')
     
-    http_username, http_password = http_username_password.split(':', 2)
-    args_username, args_password = auth.split(':', 2)
+    http_username, http_password = http_username_password.split(':', 1)
+    args_username, args_password = auth.split(':', 1)
     if http_username != args_username: return (False, 'Bad username')
     if http_password != args_password: return (False, 'Bad password')
     
@@ -452,5 +453,14 @@ def main():
     
     args = parser.parse_args()
     if not hasattr(args, 'directory'): args.directory = os.getcwd()
+    if args.bind:
+        try:
+            ipaddress.ip_address(args.bind)
+        except ValueError:
+            parser.error(
+                'Invalid -b/--bind address. Expected an IP address (no port). '
+                'Example: -b 192.168.1.10 and pass the port as a separate '
+                'argument.'
+            )
     
     serve_forever()

{uploadserver-6.0.0 → uploadserver-6.0.2/uploadserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: uploadserver
-Version: 6.0.0
+Version: 6.0.2
 Summary: Python's http.server extended to include a file upload page
 Home-page: https://github.com/Densaugeo/uploadserver
 Author: Densaugeo
@@ -11,6 +11,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 # uploadserver
 
@@ -32,13 +41,13 @@ Python's http.server extended to include a file upload page
 
 ## Installation
 
-~~~
+~~~bash
 python3 -m pip install --user uploadserver
 ~~~
 
 ## Usage
 
-~~~
+~~~bash
 python3 -m uploadserver
 ~~~
 
@@ -49,18 +58,18 @@ After the server starts, the upload page is at /upload. For example, if the serv
 Warning: This is an upload server, and running it will allow uploads.
 
 Now supports uploading multiple files at once! Select multiple files in the web page's file selector, or upload with cURL:
-~~~
+~~~bash
 curl -X POST http://127.0.0.1:8000/upload -F 'files=@multiple-example-1.txt' -F 'files=@multiple-example-2.txt'
 ~~~
 
 ## Basic Authentication (downloads and uploads)
 
-~~~
+~~~bash
 python3 -m uploadserver --basic-auth hello:world
 ~~~
 
 Now you can upload with basic authentication. For example:
-~~~
+~~~bash
 curl -X POST http://127.0.0.1:8000/upload -F 'files=@basicauth-example.txt' -u hello:world
 ~~~
 
@@ -68,7 +77,7 @@ All requests without authentication will be rejected. Note that basic authentica
 
 ## Basic Authentication (uploads only)
 
-~~~
+~~~bash
 python3 -m uploadserver --basic-auth-upload hello:world
 ~~~
 
@@ -79,18 +88,18 @@ If both `--basic-auth` and `--basic-auth-upload` are specified, all requests wil
 ## Theme Option
 
 The upload page supports a dark mode for showing white text on black background. If no option is specified, the color scheme is chosen from the client’s browser’s preference (which typically matches their operating system’s setting, if light or dark mode is supported by the OS). To enforce the light or dark theme, the CLI parameter `--theme` can be used:
-~~~
+~~~bash
 python3 -m uploadserver --theme light
 ~~~
 or
-~~~
+~~~bash
 python3 -m uploadserver --theme dark
 ~~~
 
 ## HTTPS Option
 
 Run with HTTPS and without client authentication:
-~~~
+~~~bash
 # Generate self-signed server certificate
 openssl req -x509 -out server.pem -keyout server.pem -newkey rsa:2048 -nodes -sha256 -subj '/CN=server'
 
@@ -103,7 +112,7 @@ curl -X POST https://localhost:8000/upload --insecure -F files=@simple-example.t
 ~~~
 
 Run with HTTPS and with client authentication:
-~~~
+~~~bash
 # Generate self-signed server certificate
 openssl req -x509 -out server.pem -keyout server.pem -newkey rsa:2048 -nodes -sha256 -subj '/CN=server'
 
@@ -207,3 +216,5 @@ Thanks to marvinruder for work on the upload progress indicator, theme option, a
 Thanks to shuangye for finding an easy way to handle large file uploads, and improved handling of filename collisions.
 
 Thanks to abbbe for adding HTTP basic auth (has now replaced the token option).
+
+Thanks to SimarMugattarov, theo543, and poshul for minor updates.