Skip to content

Commit f9ba143

Browse files
mauricelambertmauricelambert
authored
[0.0.3] Fix: request authentication required
 - Fix: request authentication required - Request message options - Request message authentication options
1 parent 38470d6 commit f9ba143

File tree

10 files changed

+193
-9
lines changed

10 files changed

+193
-9
lines changed

‎MANIFEST.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
include *.md
2-
include *.txt
2+
include *.txt
3+
include *.spec
4+
include *.bat
5+
include *.ico

‎PKG-INFO‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Metadata-Version: 2.1
22
Name: WebScriptsClient
3-
Version: 0.0.2
4-
Summary: This package implements the "official" WebScripts client. This package implements client for default WebScripts features.
3+
Version: 0.0.3
4+
Summary: This package implements the "official" WebScripts client.
55
Home-page: https://github.com/mauricelambert/WebScriptsClient
66
Author: Maurice Lambert
77
Author-email: mauricelambert434@gmail.com

‎WebScripts.ico‎

99.2 KB
Binary file not shown.

‎WebScriptsClient.egg-info/PKG-INFO‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Metadata-Version: 2.1
22
Name: WebScriptsClient
3-
Version: 0.0.2
4-
Summary: This package implements the "official" WebScripts client. This package implements client for default WebScripts features.
3+
Version: 0.0.3
4+
Summary: This package implements the "official" WebScripts client.
55
Home-page: https://github.com/mauricelambert/WebScriptsClient
66
Author: Maurice Lambert
77
Author-email: mauricelambert434@gmail.com

‎WebScriptsClient.egg-info/SOURCES.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
LICENSE.txt
22
MANIFEST.in
33
README.md
4+
WebScripts.ico
45
WebScriptsClient.py
6+
WebScriptsClient_onedir.spec
7+
WebScriptsClient_onefile.spec
8+
compilateur.bat
9+
file_version_info.txt
510
setup.py
611
WebScriptsClient.egg-info/PKG-INFO
712
WebScriptsClient.egg-info/SOURCES.txt

‎WebScriptsClient.py‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,37 @@
2323
This package implements the "official" WebScripts client.
2424
This package implements client for default WebScripts features.
2525
26+
Basic:
27+
28+
~# python -m WebScriptsClient -u Admin -p Admin exec "show_license.py" http://127.0.0.1:8000/web/auth/
29+
30+
ExitCode: 1
31+
Errors: USAGE: show_license.py [part required string]
32+
33+
~# python -m WebScriptsClient -u Admin -p Admin exec "show_license.py copyright" http://127.0.0.1:8000/web/auth/
34+
35+
WebScripts Copyright (C) 2021, 2022 Maurice Lambert
36+
This program comes with ABSOLUTELY NO WARRANTY.
37+
This is free software, and you are welcome to redistribute it
38+
under certain conditions.
39+
40+
41+
ExitCode: 0
42+
Errors:
43+
44+
~# python -m WebScriptsClient -u Admin -p Admin exec "show_license.py copyright error" http://127.0.0.1:8000/web/auth/
45+
46+
WebScripts Copyright (C) 2021, 2022 Maurice Lambert
47+
This program comes with ABSOLUTELY NO WARRANTY.
48+
This is free software, and you are welcome to redistribute it
49+
under certain conditions.
50+
51+
52+
ExitCode: 2
53+
Errors: ERROR: unexpected arguments ['error']
54+
55+
Full examples:
56+
2657
~# python WebScriptsClient.py -v -u Admin -p Admin test http://127.0.0.1:8000/web/
2758
2859
~# python WebScriptsClient.py -v -u Admin -p Admin download -f "LICENSE.txt" "LICENSE.txt" http://127.0.0.1:8000/web/
@@ -41,6 +72,9 @@
4172
~# python -c "print('test')" > test.txt
4273
~# python WebScriptsClient.py -v -u Admin -p Admin exec "test_config.py" -I test.txt http://127.0.0.1:8000/web/
4374
~# python WebScriptsClient.py -v -u Admin -p Admin exec "test_config.py --test test3 --test4 -t" -i "test1" "test2" http://127.0.0.1:8000/web/
75+
~# python -m WebScriptsClient -u Admin -p Admin exec password_generator.py http://127.0.0.1:8000/web/auth/
76+
~# python -m WebScriptsClient -u Admin -p Admin exec "show_license.py license" http://127.0.0.1:8000/web/auth/
77+
~# python -m WebScriptsClient -u Admin -p Admin exec "show_license.py copyright codeheader" http://127.0.0.1:8000/web/auth/
4478
4579
~# python WebScriptsClient.py -v info http://127.0.0.1:8000/web/
4680
~# python WebScriptsClient.py -a AdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdminAdmin info -a -c -d -s "test_config.py" "/auth/" http://127.0.0.1:8000/web/
@@ -58,7 +92,7 @@
5892
>>> print(f"Error: {error}")
5993
"""
6094

61-
__version__ = "0.0.2"
95+
__version__ = "0.0.3"
6296
__author__ = "Maurice Lambert"
6397
__author_email__ = "mauricelambert434@gmail.com"
6498
__maintainer__ = "Maurice Lambert"
@@ -231,7 +265,8 @@ def http_error_403(
231265
log = f"HTTP error {code}: {message} -> you do not have permissions."
232266
url = request.get_full_url()
233267
command = (
234-
f"{argv[0]} request -n [name] -t Access -r"
268+
f"{argv[0]} [(-a <KEY>|-A|-u <USER> -p <PASSWORD>|-u -P)]"
269+
" request -n [name] -s Access -r"
235270
f' "I need access to this script." {url}'
236271
)
237272
logger_error(log)
@@ -280,7 +315,8 @@ def http_error_302(
280315
log = f"HTTP error {code}: {message} -> you do not have permissions."
281316
url = request.get_full_url()
282317
command = (
283-
f"{argv[0]} request -n [name] -t Access -r"
318+
f"{argv[0]} [(-a <KEY>|-A|-u <USER> -p <PASSWORD>|-u -P)]"
319+
" request -n [name] -s Access -r"
284320
f' "I need access to this script." {url}'
285321
)
286322
logger_error(log)
@@ -1179,7 +1215,16 @@ def cli_request(args: Namespace) -> None:
11791215
logger_debug("Authenticate the WebScriptsClient...")
11801216
client.auth()
11811217

1182-
client.request(args.subject, args.request, args.name, args.error_code)
1218+
try:
1219+
client.request(args.subject, args.request, args.name, args.error_code)
1220+
except WebScriptsPermissionsError:
1221+
log = (
1222+
"Please, retry with authentication. "
1223+
"An authentication is required on this server."
1224+
)
1225+
logger_error(log)
1226+
print(log)
1227+
11831228
logger_debug("Request sent without error.")
11841229

11851230

‎WebScriptsClient_onedir.spec‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# -*- mode: python ; coding: utf-8 -*-
2+
3+
4+
block_cipher = None
5+
6+
7+
a = Analysis(
8+
["WebScriptsClient.py"],
9+
pathex=[],
10+
binaries=[],
11+
datas=[],
12+
hiddenimports=[],
13+
hookspath=[],
14+
hooksconfig={},
15+
runtime_hooks=[],
16+
excludes=[],
17+
win_no_prefer_redirects=False,
18+
win_private_assemblies=False,
19+
cipher=block_cipher,
20+
noarchive=False,
21+
)
22+
23+
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
24+
25+
exe = EXE(
26+
pyz,
27+
a.scripts,
28+
[],
29+
exclude_binaries=True,
30+
name="WebScriptsClient",
31+
debug=False,
32+
bootloader_ignore_signals=False,
33+
strip=False,
34+
upx=True,
35+
console=True,
36+
disable_windowed_traceback=False,
37+
target_arch=None,
38+
codesign_identity=None,
39+
entitlements_file=None,
40+
version="file_version_info.txt",
41+
icon="WebScripts.ico",
42+
)
43+
coll = COLLECT(
44+
exe,
45+
a.binaries,
46+
a.zipfiles,
47+
a.datas,
48+
strip=False,
49+
upx=True,
50+
upx_exclude=[],
51+
name="WebScriptsClient",
52+
)

‎WebScriptsClient_onefile.spec‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# -*- mode: python ; coding: utf-8 -*-
2+
3+
4+
block_cipher = None
5+
6+
7+
a = Analysis(
8+
["WebScriptsClient.py"],
9+
pathex=[],
10+
binaries=[],
11+
datas=[],
12+
hiddenimports=[],
13+
hookspath=[],
14+
hooksconfig={},
15+
runtime_hooks=[],
16+
excludes=[],
17+
win_no_prefer_redirects=False,
18+
win_private_assemblies=False,
19+
cipher=block_cipher,
20+
noarchive=False,
21+
)
22+
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
23+
24+
exe = EXE(
25+
pyz,
26+
a.scripts,
27+
a.binaries,
28+
a.zipfiles,
29+
a.datas,
30+
[],
31+
name="WebScriptsClient",
32+
debug=False,
33+
bootloader_ignore_signals=False,
34+
strip=False,
35+
upx=True,
36+
upx_exclude=[],
37+
runtime_tmpdir=None,
38+
console=True,
39+
disable_windowed_traceback=False,
40+
target_arch=None,
41+
codesign_identity=None,
42+
entitlements_file=None,
43+
version="file_version_info.txt",
44+
icon="WebScripts.ico",
45+
)

‎compilateur.bat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
pyinstaller WebScriptsClient_onedir.spec
2+
pause
3+
pyinstaller --log-level DEBUG --clean WebScriptsClient_onefile.spec

‎file_version_info.txt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# UTF-8
2+
#
3+
4+
VSVersionInfo(
5+
ffi=FixedFileInfo(
6+
filevers=(1, 0, 0, 0),
7+
prodvers=(1, 0, 0, 0),
8+
mask=0x3f,
9+
flags=0x0,
10+
OS=0x4,
11+
fileType=0x1,
12+
subtype=0x0,
13+
date=(0, 0)
14+
),
15+
kids=[
16+
StringFileInfo(
17+
[
18+
StringTable(
19+
u'000004b0',
20+
[StringStruct(u'CompanyName', u'MauriceLambert'),
21+
StringStruct(u'FileDescription', u'This executable implements a complete spyware.'),
22+
StringStruct(u'FileVersion', u'1.0.0'),
23+
StringStruct(u'InternalName', u'SpyWare'),
24+
StringStruct(u'LegalCopyright', u'SpyWare Copyright (C) 2021, 2022 Maurice Lambert'),
25+
StringStruct(u'OriginalFilename', u'SpyWare.exe'),
26+
StringStruct(u'ProductName', u'SpyWare'),
27+
StringStruct(u'ProductVersion', u'1.0.0')])
28+
]),
29+
VarFileInfo([VarStruct(u'Translation', [0, 1200])])
30+
]
31+
)

0 commit comments

Comments
 (0)