BlueGit

projects-timfalken-com verhalenboek

Merge branch 'cursor/diagnose-500' into 'master'

timfa

Authored 2026-10-30 · 2 weeks ago

Hash
6f40736dda1105e80e867637431bb145b3774f32
Pipeline
Passed
2 files changed +54 −0
blue-ci-cd.yml +15 −0
@@ -53,3 +53,18 @@ ftp_upload:
53 53 script:
54 54 - python3 ci/deploy_guard.py
55 55 - python3 ci/deploy.py
56
57 # Read-only diagnosis of the live project folder (listing + .htaccess only). Manual, master only.
58 server_diagnose:
59 stage: deploy
60 image: debian:bookworm-slim
61 needs: []
62 rules:
63 - if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE != "merge_request_event"'
64 when: manual
65 allow_failure: true
66 before_script:
67 - apt-get update -qq
68 - apt-get install -y --no-install-recommends python3 lftp ca-certificates openssh-client
69 script:
70 - python3 ci/diagnose.py
@@ -53,3 +53,18 @@ ftp_upload:
53 script:
53 script:
54 - python3 ci/deploy_guard.py
54 - python3 ci/deploy_guard.py
55 - python3 ci/deploy.py
55 - python3 ci/deploy.py
56
57# Read-only diagnosis of the live project folder (listing + .htaccess only). Manual, master only.
58server_diagnose:
59 stage: deploy
60 image: debian:bookworm-slim
61 needs: []
62 rules:
63 - if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE != "merge_request_event"'
64 when: manual
65 allow_failure: true
66 before_script:
67 - apt-get update -qq
68 - apt-get install -y --no-install-recommends python3 lftp ca-certificates openssh-client
69 script:
70 - python3 ci/diagnose.py
ci/diagnose.py added +39 −0
@@ -0,0 +1,39 @@
1 #!/usr/bin/env python3
2 """Read-only server diagnosis: lists names/sizes/dates and shows .htaccess files.
3 Never downloads data (sqlite) or secrets; never writes. Password never enters argv."""
4 import os, subprocess, sys
5 from pathlib import Path
6 sys.path.insert(0, str(Path(__file__).resolve().parent))
7 from deploy_guard import project_dir # noqa: E402
8 from deploy import quoted # noqa: E402
9 from urllib.parse import urlsplit
10
11 def main():
12 e = os.environ
13 target = project_dir(e)
14 host = e['timftphost'] if '://' in e['timftphost'] else 'ftp://' + e['timftphost']
15 if not urlsplit(host).hostname:
16 print('bad host'); return 1
17 cmds = [
18 'set net:timeout 20', 'set net:max-retries 2', 'set ssl:verify-certificate no',
19 'set ftp:list-options -a',
20 'set sftp:connect-program "ssh -a -x -o StrictHostKeyChecking=accept-new"',
21 f'open --user {quoted(e["timftpuser"])} --env-password {quoted(host)}',
22 f'cd {quoted(target)}',
23 'echo "== project dir"', 'cls -l --sort=name',
24 'echo "== data"', 'cls -l data/',
25 'echo "== lib"', 'cls -l lib/',
26 'echo "== .htaccess"', 'cat .htaccess',
27 'echo "== data/.htaccess"', 'cat data/.htaccess',
28 'echo "== .user.ini"', 'cat .user.ini',
29 'echo "== parent dir"', 'cls -l ..',
30 'bye',
31 ]
32 r = subprocess.run(['lftp', '--norc'], input='\n'.join(cmds) + '\n', text=True,
33 capture_output=True, env={**e, 'LFTP_PASSWORD': e['timftppassword']})
34 out = (r.stdout + r.stderr).replace(e['timftppassword'], '***').replace(e['timftpuser'], '<user>')
35 print(out)
36 return 0
37
38 if __name__ == '__main__':
39 sys.exit(main())
@@ -0,0 +1,39 @@
1#!/usr/bin/env python3
2"""Read-only server diagnosis: lists names/sizes/dates and shows .htaccess files.
3Never downloads data (sqlite) or secrets; never writes. Password never enters argv."""
4import os, subprocess, sys
5from pathlib import Path
6sys.path.insert(0, str(Path(__file__).resolve().parent))
7from deploy_guard import project_dir # noqa: E402
8from deploy import quoted # noqa: E402
9from urllib.parse import urlsplit
10
11def main():
12 e = os.environ
13 target = project_dir(e)
14 host = e['timftphost'] if '://' in e['timftphost'] else 'ftp://' + e['timftphost']
15 if not urlsplit(host).hostname:
16 print('bad host'); return 1
17 cmds = [
18 'set net:timeout 20', 'set net:max-retries 2', 'set ssl:verify-certificate no',
19 'set ftp:list-options -a',
20 'set sftp:connect-program "ssh -a -x -o StrictHostKeyChecking=accept-new"',
21 f'open --user {quoted(e["timftpuser"])} --env-password {quoted(host)}',
22 f'cd {quoted(target)}',
23 'echo "== project dir"', 'cls -l --sort=name',
24 'echo "== data"', 'cls -l data/',
25 'echo "== lib"', 'cls -l lib/',
26 'echo "== .htaccess"', 'cat .htaccess',
27 'echo "== data/.htaccess"', 'cat data/.htaccess',
28 'echo "== .user.ini"', 'cat .user.ini',
29 'echo "== parent dir"', 'cls -l ..',
30 'bye',
31 ]
32 r = subprocess.run(['lftp', '--norc'], input='\n'.join(cmds) + '\n', text=True,
33 capture_output=True, env={**e, 'LFTP_PASSWORD': e['timftppassword']})
34 out = (r.stdout + r.stderr).replace(e['timftppassword'], '***').replace(e['timftpuser'], '<user>')
35 print(out)
36 return 0
37
38if __name__ == '__main__':
39 sys.exit(main())