Commit Graph
1251 Commits
Author SHA1 Message Date
duan_j 54c8c33995 simplify Kerberos authentication by removing JSON parsing and token validation steps 2026-06-11 16:19:36 +02:00
duan_j c6698dca06 remove Apache access log-based authentication and simplify Kerberos proxy handling 2026-06-11 15:55:10 +02:00
appleb_m 2a3b09e719 banner: added banner for spalsh screen 2026-06-10 15:06:56 +02:00
appleb_m 22b8f15fd5 gui: updated autoamtion view and added mode switrching buttons 2026-06-10 15:06:45 +02:00
appleb_m a5683c9728 gui: made certPath command line option unique 2026-06-10 14:50:32 +02:00
appleb_m 01a656d956 auth: added additioanl exception tracking, updated x10sa yaml 2026-06-10 14:27:54 +02:00
appleb_m 860cedfa1a GUI: added raster rotation and screening counts to GUI tell panel adn reference tools panel 2026-06-10 14:27:38 +02:00
appleb_m 076c796b4d tests: updated tests for new authentication protocols and for new sample short info 2026-06-10 14:27:37 +02:00
duan_j c3bc745210 add support for configurable certificate paths per beamline in GUI 2026-06-10 14:25:20 +02:00
duan_j 0c0ebe2ff1 use cacert path from function parameters 2026-06-10 14:25:20 +02:00
duan_j a0dee43a37 load cacert path from funtion parameters 2026-06-10 14:25:20 +02:00
duan_j 0212f5c29e remove hard coded CACERT path 2026-06-10 14:25:16 +02:00
duan_j 5e00773160 pass cert_path for each beamline yaml 2026-06-10 14:24:49 +02:00
appleb_m 7613fec52c auth: printing base_url for debugging 2026-06-10 11:40:43 +02:00
appleb_m 1919c25874 error handling in daq 2026-06-10 11:40:30 +02:00
duan_j 37ef7e8381 handle SSL errors for self-signed certificates in SSEClient and DAQWorker 2026-06-10 11:28:07 +02:00
duan_j 78cb160377 make sure GUI checks the certificate for HTTPS requests 2026-06-10 11:26:04 +02:00
duan_j 7b60d67ebe disable proxy headers in uvicorn configuration 2026-06-10 10:35:36 +02:00
duan_j 7c19d80e20 add logging for client host validation in authentication module 2026-06-10 10:27:37 +02:00
duan_j 4c0c86b8ec validate proxy header authentication by checking loopback addresses 2026-06-10 10:24:28 +02:00
duan_j 11a56addee migrate DAQ URLs to HTTPS and simplify Kerberos SPNEGO token authentication 2026-06-10 10:18:38 +02:00
appleb_m f031e011ae Merge remote-tracking branch 'origin/apache-auth' into apache-auth 2026-06-09 16:31:56 +02:00
duan_j c633891c4a add Apache authentication and token handling using curl in GUI and access log parsing in DAQ 2026-06-09 16:31:34 +02:00
duan_j fca7c588c5 remove dependency on gssapi directly using curl to negotiate with https from GUI 2026-06-09 16:31:34 +02:00
duan_j 96d9e602e4 remove dependency on gssapi 2026-06-09 16:31:34 +02:00
duan_j f0ecba9a8a add Kerberos authentication support with proxy headers 2026-06-09 16:31:34 +02:00
appleb_m 060a9dfa62 bec_worker: no longer using initialise_sample_environment_devices
Build and Publish / test (push) Successful in 1m38s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 39s
2026-06-09 16:30:17 +02:00
duan_j 6351265698 add Apache authentication and token handling using curl in GUI and access log parsing in DAQ 2026-06-09 16:16:11 +02:00
duan_j 8dc1ecacb2 remove dependency on gssapi directly using curl to negotiate with https from GUI 2026-06-09 15:45:33 +02:00
duan_j 6bed4102e7 remove dependency on gssapi 2026-06-09 15:44:42 +02:00
appleb_m 6234b6231f Merge remote-tracking branch 'origin/apache-auth' into apache-auth 2026-06-09 14:33:27 +02:00
duan_j de0781053a add Kerberos authentication support with proxy headers 2026-06-09 14:32:01 +02:00
appleb_m b8041c52a4 CONFIG: forgot to commit changes to config redis handling!
Build and Publish / test (push) Successful in 1m36s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 38s
2026-06-09 14:26:06 +02:00
appleb_m bd8f66009c DAQ: finish refactor of exception handler, improve mount count fail handling and updated tests 2026-06-09 14:25:37 +02:00
appleb_m 675549c1c2 GUI: added automation_progress.py and updated comapct automation view
Build and Publish / test (push) Successful in 1m39s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (push) Successful in 38s
2026-06-09 13:37:33 +02:00
appleb_m 86ceebb120 tests: fixed errros with DataCollectionParameter assumptions in tests
Build and Publish / test (push) Successful in 1m40s
Build and Publish / build (push) Failing after 17s
Build and Publish / Build and Deploy Docs (push) Skipped
0.3.2
2026-06-09 12:00:15 +02:00
appleb_m 87c4f5b241 comapct automation panel updates 2026-06-09 11:59:51 +02:00
appleb_m 46d76a5e0e compact_automation: making a simplified view for autoamtion. 2026-06-09 11:20:29 +02:00
appleb_m 376375673b sample_short_info: added tracker for rotation, raster and screening count
Build and Publish / test (push) Failing after 1m34s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
2026-06-09 11:18:31 +02:00
appleb_m 0756578acd Merge remote-tracking branch 'origin/master' 2026-06-09 11:17:12 +02:00
appleb_m 0a47294244 gui_tests: removed irrelevant import/mocking that was causing tests to fail 2026-06-09 11:16:09 +02:00
GotthardG 07352f8d00 update to datacollection parameters model
Build and Publish / test (push) Failing after 1m39s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
2026-06-09 09:56:42 +02:00
appleb_m 4322720f8f gui:busy overlay fixes
Build and Publish / test (push) Failing after 1m41s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
2026-06-09 09:53:16 +02:00
appleb_m 3f06afa8e5 main_window - needed cfg_get for secondary camera - secondary camera should be in gui 2026-06-09 09:53:00 +02:00
appleb_m 7c3629529e xo6da: added secondary beamline camera. 2026-06-09 09:52:30 +02:00
appleb_m dcbd945053 busy_ovoerlay: added a busy_overlay widget so that both axis cameras and the sam cam source the same busy overlay settings 2026-06-08 14:40:26 +02:00
appleb_m 447767f7de camer_image - busy is now middle/botom of screen. To be adjusted further. Can udno this very easyily 2026-06-08 13:42:10 +02:00
appleb_m cbfb66949e axis_camera: added refeesh button and busy overlay. Made sperate widget/panel as "default" axis camera tab 2026-06-08 13:40:27 +02:00
appleb_m 73b49829da Merge remote-tracking branch 'origin/master' 2026-06-08 11:47:58 +02:00
appleb_m 8867cdc791 aaredb: fixed indentation for certificate paths 2026-06-08 11:47:39 +02:00