object-storage-client 0.4.7__tar.gz → 0.4.8__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/Cargo.lock +1 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/Cargo.toml +3 -3
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/PKG-INFO +20 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/README.md +19 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/docs/DEVELOPMENT.md +10 -7
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/docs/GUI.md +8 -2
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/docs/TESTING.md +1 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/docs/UPGRADING.md +5 -1
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/azure.rs +25 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/gcs.rs +16 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/mod.rs +31 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/s3.rs +24 -1
- object_storage_client-0.4.8/src/core/mod.rs +20 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action/conn.rs +1 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action/job.rs +1 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action/tests/conn.rs +2 -2
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action/tests.rs +1 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action.rs +1 -1
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/gui}/connection/aws.rs +47 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/gui}/connection/mod.rs +5 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/model.rs +1 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/view/address_bar.rs +4 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/view/panel.rs +1 -1
- object_storage_client-0.4.8/src/gui/view/security.rs +268 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/view/tests.rs +2 -2
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/view/toolbar.rs +4 -6
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/view.rs +1 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/worker/tests.rs +1 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/worker.rs +1 -1
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui.rs +3 -2
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/lib.rs +14 -17
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/perf_guards.rs +2 -2
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/.cargo/config.toml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/.docker/garage.toml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/.gitattributes +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/.github/dependabot.yml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/.github/workflows/ci.yaml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/.github/workflows/perf.yaml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/.github/workflows/tests.yaml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/.gitignore +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/.python-version +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/LICENSE +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/benches/alloc-counter/Cargo.toml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/benches/alloc-counter/src/lib.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/benches/common/mod.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/benches/throughput.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/compose.yml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/deny.toml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/docs/BEHAVIOR.md +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/docs/CONFIGURATION.md +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/docs/ENCRYPTION.md +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/docs/images/osc-gui.png +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/packaging/aur/PKGBUILD.template +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/packaging/icon/osc-gui.png +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/packaging/linux/osc-gui.desktop +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/packaging/macos/Info.plist.template +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/packaging/macos/README.txt +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/packaging/nfpm.yaml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/proptest-regressions/encryption/context.txt +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/pyproject.toml +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/python/object_storage_client/__init__.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/python/object_storage_client/__init__.pyi +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/python/object_storage_client/_stream.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/python/object_storage_client/_types.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/python/object_storage_client/py.typed +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/scripts/esdk_oracle.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/scripts/hostile-env.sh +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/scripts/perf_smoke.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/scripts/release/check-glibc.sh +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/scripts/release/linux-packages.sh +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/scripts/release/linux-tarball.sh +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/scripts/release/macos-dmg.sh +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/scripts/release/render-aur.sh +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/args.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/enc/tests.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/enc.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/harden.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/keyring.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/cli}/main.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/output.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/tests.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/transfer/tests.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/transfer.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/tree/tests.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli/tree.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/cli.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/aws_profile.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/body.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/connector.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/http.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/local.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/backend/stub.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/client/local_delete.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/client.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/codec.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/context.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/envelope/tests.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/envelope.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/fixtures.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/frame.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/fuzzing.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/header.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/keys/keyring/tests.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/keys/keyring.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/keys/mod.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/keys/raw_aes.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/mod.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/suite.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/encryption/tamper_tests.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/forward.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/fsmode.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/hex.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/python/client.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/python/encryption.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/python/mod.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/python/stream.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/registry.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/sign.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/text.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/core}/upload.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action/close.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action/nav.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action/tests/close.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action/tests/jobs.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/action/tests/nav.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/app.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/args.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/gui}/connection/azure.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/gui}/connection/gcp.rs +0 -0
- {object_storage_client-0.4.7/src → object_storage_client-0.4.8/src/gui}/connection/sso.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/display.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/keys.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/location.rs +0 -0
- /object_storage_client-0.4.7/src/bin/osc-gui.rs → /object_storage_client-0.4.8/src/gui/main.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/ops/tests.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/ops.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/startup.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/view/dialogs.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/view/startup_error.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/src/gui/view/status.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/functional/aws_profile.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/functional/cli.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/functional/client.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/functional/encryption.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/functional/golden.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/functional/sign.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/functional/suite.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/functional.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/azure_storage_ops.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/common/azurite.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/common/gcs.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/common/mod.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/common/provider.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/encryption.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/file_roundtrip.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/gcs_storage_ops.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/gui_ops.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/reencrypt.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/s3_storage_ops.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration/storage_ops.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/integration.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/conftest.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_abort_at_exit.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_encrypted_client.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_encryption_runtime.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_free_threading.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_gil_contention.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_list_stream.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_pipe_native.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_plain_client.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_profile.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_roundtrip.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_shared_client.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_stream_leak.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_stream_sticky.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_stub_conformance.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_subinterpreter.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/python/test_worker_threads.py +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/support/mini_http.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/support/mock.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/support/mod.rs +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/README.md +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/ctx_long.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/ctx_min.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/ctx_utf8.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/manifest.json +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p0_f4096.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p0_f65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p1_f4096.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p1_f65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p200000_f4096.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p200000_f65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p4095_f4096.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p4095_f65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p4096_f4096.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p4096_f65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p4097_f4096.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p4097_f65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p65535_f4096.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p65535_f65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p65536_f4096.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p65536_f65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p65537_f4096.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/esdk/p65537_f65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/golden/README.md +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/golden/v1/context.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/golden/v1/keyring +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/golden/v1/manifest.json +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/golden/v1/old_key.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/golden/v1/size_0.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/golden/v1/size_1.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/golden/v1/size_200000.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/golden/v1/size_65536.bin +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/keyrings/README.md +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/keyrings/one.keyring +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/keyrings/other.keyring +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/tests/vectors/keyrings/two.keyring +0 -0
- {object_storage_client-0.4.7 → object_storage_client-0.4.8}/uv.lock +0 -0
|
@@ -9,7 +9,7 @@ license = "GPL-3.0-only"
|
|
|
9
9
|
name = "object-storage-client"
|
|
10
10
|
readme = "README.md"
|
|
11
11
|
repository = "https://github.com/bixority/object-storage-client"
|
|
12
|
-
version = "0.4.
|
|
12
|
+
version = "0.4.8"
|
|
13
13
|
|
|
14
14
|
[lib]
|
|
15
15
|
# maturin adds the cdylib crate type itself; do not list it here.
|
|
@@ -67,12 +67,12 @@ python = ["dep:pyo3", "dep:pyo3-async-runtimes", "encryption"]
|
|
|
67
67
|
|
|
68
68
|
[[bin]]
|
|
69
69
|
name = "osc"
|
|
70
|
-
path = "src/main.rs"
|
|
70
|
+
path = "src/cli/main.rs"
|
|
71
71
|
required-features = ["cli"]
|
|
72
72
|
|
|
73
73
|
[[bin]]
|
|
74
74
|
name = "osc-gui"
|
|
75
|
-
path = "src/
|
|
75
|
+
path = "src/gui/main.rs"
|
|
76
76
|
required-features = ["gui"]
|
|
77
77
|
|
|
78
78
|
[[bench]]
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: object-storage-client
|
|
3
|
-
Version: 0.4.
|
|
3
|
+
Version: 0.4.8
|
|
4
4
|
Classifier: Programming Language :: Rust
|
|
5
5
|
Classifier: Programming Language :: Python :: Implementation :: CPython
|
|
6
6
|
Classifier: Programming Language :: Python :: 3
|
|
@@ -96,6 +96,22 @@ cargo install --path . --features gui
|
|
|
96
96
|
|
|
97
97
|
On Linux, `osc-gui` needs a Wayland session; X11 is not supported.
|
|
98
98
|
|
|
99
|
+
#### Build for this machine
|
|
100
|
+
|
|
101
|
+
The release packages and a plain `cargo install` target a generic CPU, so they
|
|
102
|
+
run on any x86-64 (or aarch64) machine. To build for the CPU you have, set
|
|
103
|
+
`target-cpu=native` in `RUSTFLAGS`. The binary then uses that CPU's extensions
|
|
104
|
+
and will not run on older CPUs, so do not copy it to other machines:
|
|
105
|
+
|
|
106
|
+
```bash
|
|
107
|
+
RUSTFLAGS="-C target-cpu=native" cargo install object-storage-client --registry bixority --features gui
|
|
108
|
+
# or, from a checkout:
|
|
109
|
+
RUSTFLAGS="-C target-cpu=native" cargo install --path . --features gui
|
|
110
|
+
```
|
|
111
|
+
|
|
112
|
+
The same works for `osc` (drop `--features gui`). The repository does not set
|
|
113
|
+
this flag itself, so it applies only when you set it.
|
|
114
|
+
|
|
99
115
|
### Run
|
|
100
116
|
|
|
101
117
|
```bash
|
|
@@ -126,6 +142,9 @@ cargo install object-storage-client --registry bixority
|
|
|
126
142
|
# or, from a checkout: cargo install --path .
|
|
127
143
|
```
|
|
128
144
|
|
|
145
|
+
To tune the build for your CPU, see [Build for this machine](#build-for-this-machine)
|
|
146
|
+
(`RUSTFLAGS="-C target-cpu=native"`).
|
|
147
|
+
|
|
129
148
|
### Run
|
|
130
149
|
|
|
131
150
|
```bash
|
|
@@ -76,6 +76,22 @@ cargo install --path . --features gui
|
|
|
76
76
|
|
|
77
77
|
On Linux, `osc-gui` needs a Wayland session; X11 is not supported.
|
|
78
78
|
|
|
79
|
+
#### Build for this machine
|
|
80
|
+
|
|
81
|
+
The release packages and a plain `cargo install` target a generic CPU, so they
|
|
82
|
+
run on any x86-64 (or aarch64) machine. To build for the CPU you have, set
|
|
83
|
+
`target-cpu=native` in `RUSTFLAGS`. The binary then uses that CPU's extensions
|
|
84
|
+
and will not run on older CPUs, so do not copy it to other machines:
|
|
85
|
+
|
|
86
|
+
```bash
|
|
87
|
+
RUSTFLAGS="-C target-cpu=native" cargo install object-storage-client --registry bixority --features gui
|
|
88
|
+
# or, from a checkout:
|
|
89
|
+
RUSTFLAGS="-C target-cpu=native" cargo install --path . --features gui
|
|
90
|
+
```
|
|
91
|
+
|
|
92
|
+
The same works for `osc` (drop `--features gui`). The repository does not set
|
|
93
|
+
this flag itself, so it applies only when you set it.
|
|
94
|
+
|
|
79
95
|
### Run
|
|
80
96
|
|
|
81
97
|
```bash
|
|
@@ -106,6 +122,9 @@ cargo install object-storage-client --registry bixority
|
|
|
106
122
|
# or, from a checkout: cargo install --path .
|
|
107
123
|
```
|
|
108
124
|
|
|
125
|
+
To tune the build for your CPU, see [Build for this machine](#build-for-this-machine)
|
|
126
|
+
(`RUSTFLAGS="-C target-cpu=native"`).
|
|
127
|
+
|
|
109
128
|
### Run
|
|
110
129
|
|
|
111
130
|
```bash
|
|
@@ -107,13 +107,16 @@ otherwise a `--locked` check of the fuzz crate fails.
|
|
|
107
107
|
|
|
108
108
|
## Layout
|
|
109
109
|
|
|
110
|
-
- `src/
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
`
|
|
116
|
-
- `src/
|
|
110
|
+
- `src/core/`: the library shared by both binaries. `src/core/client.rs` and
|
|
111
|
+
`src/core/codec.rs` hold the `Client` API and the plain codec;
|
|
112
|
+
`src/core/backend/` has one module per storage provider;
|
|
113
|
+
`src/core/encryption/` has the message format, framing, keyrings and the
|
|
114
|
+
encrypting codec; `src/core/python/` the bindings. `lib.rs` re-exports
|
|
115
|
+
`core` under the module names the library has always had.
|
|
116
|
+
- `src/cli.rs`, `src/cli/`, `src/cli/main.rs`: the `osc` binary
|
|
117
|
+
- `src/gui.rs`, `src/gui/`, `src/gui/main.rs`: the `osc-gui` binary;
|
|
118
|
+
`src/gui/connection/`: its connection discovery and SSO login
|
|
119
|
+
- `python/object_storage_client/`: the Python package and its type stubs
|
|
117
120
|
- `tests/`, `benches/`, `fuzz/`, `scripts/`: see [Testing](TESTING.md)
|
|
118
121
|
- `compose.yml`: Garage and Azurite for manual exploration (`docker compose up`)
|
|
119
122
|
|
|
@@ -39,8 +39,14 @@ The options are the ones `osc` takes:
|
|
|
39
39
|
| `--require-encryption` | `OSC_REQUIRE_ENCRYPTION` | Refuse to start without a key source |
|
|
40
40
|
|
|
41
41
|
The key source is opened once, at launch; a keyring file then reloads itself
|
|
42
|
-
when it changes, while a key command is not run again. The
|
|
43
|
-
|
|
42
|
+
when it changes, while a key command is not run again. The top right of the
|
|
43
|
+
toolbar shows a key (🔑) when client-side encryption is on and ⊘ when it is
|
|
44
|
+
off; hover it to see whether the keys came from a keyring file or a key
|
|
45
|
+
command. Next to each connection selector, a shield (🛡️) means the endpoint
|
|
46
|
+
uses HTTPS and its certificate is verified, a warning sign (⚠️) means HTTPS with
|
|
47
|
+
certificate verification turned off for that connection, and ◌ means no TLS
|
|
48
|
+
(a plain `http` endpoint, or Local). An AWS profile's `endpoint_url` is read when
|
|
49
|
+
the connections are found, so "Rescan" picks up a change. Hover an icon for its text. With encryption on,
|
|
44
50
|
every copy and move encrypts what it writes and decrypts what it reads, as `osc
|
|
45
51
|
cp` and `osc mv` do.
|
|
46
52
|
|
|
@@ -29,7 +29,7 @@ through `object_store`'s clients, which always honour system proxies and cannot
|
|
|
29
29
|
turn them off. The clients the crate builds itself ignore proxies in tests
|
|
30
30
|
(injected variables).
|
|
31
31
|
|
|
32
|
-
Backend unit tests that talk to a loopback stub (`src/backend/stub.rs`) run on
|
|
32
|
+
Backend unit tests that talk to a loopback stub (`src/core/backend/stub.rs`) run on
|
|
33
33
|
the real tokio clock, not `start_paused`: on macOS a paused clock can jump to
|
|
34
34
|
the HTTP timeouts while a loopback connect is still pending.
|
|
35
35
|
`stub::closed_port()` keeps its port bound, so a concurrent test's stub cannot
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
# Upgrading
|
|
2
2
|
|
|
3
|
-
## From 0.4.4 to 0.4.
|
|
3
|
+
## From 0.4.4 to 0.4.8
|
|
4
4
|
|
|
5
5
|
### `osc-gui`
|
|
6
6
|
|
|
7
|
+
- The toolbar shows a key icon (🔑) when encryption is on and ⊘ when it is off,
|
|
8
|
+
in place of the "Encryption on/off" text; hover it for where the keys came
|
|
9
|
+
from. Each panel shows a TLS icon left of its connection selector: 🛡️
|
|
10
|
+
verified HTTPS, ⚠️ HTTPS without certificate verification, ◌ no TLS.
|
|
7
11
|
- An AWS profile connection now takes `S3_REGION`, `AWS_REGION` and
|
|
8
12
|
`AWS_DEFAULT_REGION` from the environment, before the profile's `region`, as
|
|
9
13
|
the AWS CLI does. They used to be ignored, so a profile without `region`
|
|
@@ -644,6 +644,31 @@ fn configured(container: &str, vars: &Vars) -> MicrosoftAzureBuilder {
|
|
|
644
644
|
builder.with_container_name(container)
|
|
645
645
|
}
|
|
646
646
|
|
|
647
|
+
/// The TLS settings `vars` give an Azure store: the blob endpoint (the
|
|
648
|
+
/// storage emulator is plain `http`) and the builder's certificate setting.
|
|
649
|
+
#[cfg(feature = "gui")]
|
|
650
|
+
pub(super) fn tls(vars: &Vars) -> super::Tls {
|
|
651
|
+
let builder = configured("", vars);
|
|
652
|
+
let flag = |key: &AzureConfigKey| {
|
|
653
|
+
builder
|
|
654
|
+
.get_config_value(key)
|
|
655
|
+
.and_then(|v| super::parse_bool(&v))
|
|
656
|
+
.unwrap_or(false)
|
|
657
|
+
};
|
|
658
|
+
let plain = builder
|
|
659
|
+
.get_config_value(&AzureConfigKey::Endpoint)
|
|
660
|
+
.map_or_else(
|
|
661
|
+
|| flag(&AzureConfigKey::UseEmulator),
|
|
662
|
+
|endpoint| super::is_plain(&endpoint),
|
|
663
|
+
);
|
|
664
|
+
super::Tls {
|
|
665
|
+
https: !plain,
|
|
666
|
+
allow_invalid_certificates: flag(&AzureConfigKey::Client(
|
|
667
|
+
ClientConfigKey::AllowInvalidCertificates,
|
|
668
|
+
)),
|
|
669
|
+
}
|
|
670
|
+
}
|
|
671
|
+
|
|
647
672
|
#[cfg(test)]
|
|
648
673
|
mod tests {
|
|
649
674
|
use super::*;
|
|
@@ -281,6 +281,22 @@ fn base_url(vars: &Vars, builder: &GoogleCloudStorageBuilder) -> String {
|
|
|
281
281
|
)
|
|
282
282
|
}
|
|
283
283
|
|
|
284
|
+
/// The TLS settings `vars` give a GCS store: the JSON API origin and the
|
|
285
|
+
/// builder's certificate setting.
|
|
286
|
+
#[cfg(feature = "gui")]
|
|
287
|
+
pub(super) fn tls(vars: &Vars) -> super::Tls {
|
|
288
|
+
let builder = configured("", vars);
|
|
289
|
+
super::Tls {
|
|
290
|
+
https: !super::is_plain(&base_url(vars, &builder)),
|
|
291
|
+
allow_invalid_certificates: builder
|
|
292
|
+
.get_config_value(&GoogleConfigKey::Client(
|
|
293
|
+
object_store::ClientConfigKey::AllowInvalidCertificates,
|
|
294
|
+
))
|
|
295
|
+
.and_then(|v| super::parse_bool(&v))
|
|
296
|
+
.unwrap_or(false),
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
|
|
284
300
|
/// Attaches the bearer token to `request`, but only when `base` is an https
|
|
285
301
|
/// origin so a token is never sent in clear text to a custom `GCS_BASE_URL`.
|
|
286
302
|
/// `disable_oauth` (emulators) yields an empty bearer: no header is sent.
|
|
@@ -26,6 +26,8 @@ pub mod stub;
|
|
|
26
26
|
use crate::client::{Error, Result};
|
|
27
27
|
use crate::sign::{SignMethod, SignOptions};
|
|
28
28
|
pub use aws_profile::AwsProfile;
|
|
29
|
+
#[cfg(feature = "gui")]
|
|
30
|
+
pub use aws_profile::{files as profile_files, settings as profile_settings};
|
|
29
31
|
pub use body::FILE_BUF;
|
|
30
32
|
pub use body::body_stream;
|
|
31
33
|
#[cfg(feature = "gui")]
|
|
@@ -175,6 +177,35 @@ impl Vars {
|
|
|
175
177
|
}
|
|
176
178
|
}
|
|
177
179
|
|
|
180
|
+
/// What a provider's settings say about TLS, read without building a store or
|
|
181
|
+
/// contacting a server.
|
|
182
|
+
#[cfg(feature = "gui")]
|
|
183
|
+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
184
|
+
pub struct Tls {
|
|
185
|
+
/// The endpoint is `https` (the default of every provider), not plain `http`.
|
|
186
|
+
pub https: bool,
|
|
187
|
+
/// Certificate verification is switched off (`*_ALLOW_INVALID_CERTIFICATES`).
|
|
188
|
+
pub allow_invalid_certificates: bool,
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
/// The TLS settings of the store `vars` configure for `scheme` (`s3`, `gs` or
|
|
192
|
+
/// `az`), resolved as [`build`] resolves them. `None` for another scheme.
|
|
193
|
+
#[cfg(feature = "gui")]
|
|
194
|
+
pub fn tls(scheme: &str, vars: &Vars) -> Option<Tls> {
|
|
195
|
+
match scheme {
|
|
196
|
+
"s3" => Some(s3::tls(vars)),
|
|
197
|
+
"gs" | "gcs" => Some(gcs::tls(vars)),
|
|
198
|
+
"az" | "wasb" | "wasbs" | "abfs" | "abfss" => Some(azure::tls(vars)),
|
|
199
|
+
_ => None,
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
/// Whether `endpoint` is a plain `http://` URL, as every backend decides it.
|
|
204
|
+
#[cfg(feature = "gui")]
|
|
205
|
+
fn is_plain(endpoint: &str) -> bool {
|
|
206
|
+
endpoint.starts_with("http://")
|
|
207
|
+
}
|
|
208
|
+
|
|
178
209
|
/// How long an object request may stay silent: the time to the response
|
|
179
210
|
/// headers and every gap between body reads. The first covers sending the
|
|
180
211
|
/// request body, so each upload request (one put or one part) must be sent and
|
|
@@ -379,7 +379,7 @@ impl S3Backend {
|
|
|
379
379
|
/// own `S3_ENDPOINT`, then `AWS_ENDPOINT_URL_S3`, `AWS_ENDPOINT` and
|
|
380
380
|
/// `AWS_ENDPOINT_URL`; empty values are ignored. `None` means "no custom
|
|
381
381
|
/// endpoint" — i.e. real AWS, where the IMDS credential fallback is valid.
|
|
382
|
-
fn configured_endpoint(vars: &Vars) -> Option<String> {
|
|
382
|
+
pub(super) fn configured_endpoint(vars: &Vars) -> Option<String> {
|
|
383
383
|
[
|
|
384
384
|
"S3_ENDPOINT",
|
|
385
385
|
"AWS_ENDPOINT_URL_S3",
|
|
@@ -578,6 +578,29 @@ impl S3Backend {
|
|
|
578
578
|
|
|
579
579
|
/// The key of `path` as a URI path: everything but unreserved characters and
|
|
580
580
|
/// `/` is percent-encoded, as `object_store` does for its own requests.
|
|
581
|
+
/// The TLS settings `vars` give an S3 store: the endpoint [`S3Backend::with_shared`]
|
|
582
|
+
/// picks from the variables, and the builder's certificate setting. An endpoint
|
|
583
|
+
/// that only an AWS profile names is not read here (that takes file I/O).
|
|
584
|
+
#[cfg(feature = "gui")]
|
|
585
|
+
pub(super) fn tls(vars: &Vars) -> super::Tls {
|
|
586
|
+
let builder = match vars {
|
|
587
|
+
Vars::Env => AmazonS3Builder::from_env(),
|
|
588
|
+
Vars::Map { .. } => vars
|
|
589
|
+
.config_entries::<AmazonS3ConfigKey>("AWS_")
|
|
590
|
+
.into_iter()
|
|
591
|
+
.fold(AmazonS3Builder::new(), |b, (k, v)| b.with_config(k, v)),
|
|
592
|
+
};
|
|
593
|
+
super::Tls {
|
|
594
|
+
https: !S3Backend::configured_endpoint(vars).is_some_and(|ep| super::is_plain(&ep)),
|
|
595
|
+
allow_invalid_certificates: builder
|
|
596
|
+
.get_config_value(&AmazonS3ConfigKey::Client(
|
|
597
|
+
object_store::ClientConfigKey::AllowInvalidCertificates,
|
|
598
|
+
))
|
|
599
|
+
.and_then(|v| parse_bool(&v))
|
|
600
|
+
.unwrap_or(false),
|
|
601
|
+
}
|
|
602
|
+
}
|
|
603
|
+
|
|
581
604
|
fn encode_key(path: &ObjectPath) -> String {
|
|
582
605
|
const KEY: &percent_encoding::AsciiSet = &percent_encoding::NON_ALPHANUMERIC
|
|
583
606
|
.remove(b'-')
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
//! The storage library shared by `osc` and `osc-gui`: clients, backends,
|
|
2
|
+
//! encryption, the registry and the Python bindings.
|
|
3
|
+
|
|
4
|
+
#[cfg(test)]
|
|
5
|
+
#[macro_use]
|
|
6
|
+
mod forward;
|
|
7
|
+
|
|
8
|
+
pub mod backend;
|
|
9
|
+
pub mod client;
|
|
10
|
+
pub mod codec;
|
|
11
|
+
#[cfg(feature = "encryption")]
|
|
12
|
+
pub mod encryption;
|
|
13
|
+
pub mod fsmode;
|
|
14
|
+
pub mod hex;
|
|
15
|
+
#[cfg(feature = "python")]
|
|
16
|
+
pub mod python;
|
|
17
|
+
pub mod registry;
|
|
18
|
+
pub mod sign;
|
|
19
|
+
pub mod text;
|
|
20
|
+
pub mod upload;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
//! Connection rules: choosing a panel's connection, scanning, SSO login.
|
|
2
2
|
|
|
3
3
|
use super::{Command, nav};
|
|
4
|
-
use crate::connection::{Connection, Discovery, Login};
|
|
4
|
+
use crate::gui::connection::{Connection, Discovery, Login};
|
|
5
5
|
use crate::gui::location::Location;
|
|
6
6
|
use crate::gui::model::{AppState, Closing, Dialog, Side};
|
|
7
7
|
use std::sync::Arc;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
//! Job and dialog rules: starting operations, planning, confirming, progress.
|
|
2
2
|
|
|
3
3
|
use super::{Answer, Command, nav};
|
|
4
|
-
use crate::connection::Connection;
|
|
4
|
+
use crate::gui::connection::Connection;
|
|
5
5
|
use crate::gui::location::Location;
|
|
6
6
|
use crate::gui::model::{
|
|
7
7
|
AppState, Batch, Closing, Dialog, Entry, Item, Job, JobId, JobPhase, OnExisting, OpKind,
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
//! Connection rules: choosing, scanning, scheme checks, roots, SSO login.
|
|
2
2
|
|
|
3
3
|
use super::{act, dir, loc, obj, page, plan, planned, s3, s3_state, state};
|
|
4
|
-
use crate::connection::sso::SsoLogin;
|
|
5
|
-
use crate::connection::{Connection, Discovery, Login, Provider, Source};
|
|
6
4
|
use crate::gui::action::{Action, Answer, Command, Event, Msg, SelectOp, update};
|
|
5
|
+
use crate::gui::connection::sso::SsoLogin;
|
|
6
|
+
use crate::gui::connection::{Connection, Discovery, Login, Provider, Source};
|
|
7
7
|
use crate::gui::model::{AppState, Dialog, Entry, Item, OpKind, Outcome, Side};
|
|
8
8
|
use std::sync::Arc;
|
|
9
9
|
|
|
@@ -12,7 +12,7 @@ use super::model::{
|
|
|
12
12
|
AppState, Batch, Closing, Dialog, Encryption, EntryKey, JobId, OnExisting, OpKind, Outcome,
|
|
13
13
|
Page, PanelState, Plan, Side,
|
|
14
14
|
};
|
|
15
|
-
use crate::connection::{Connection, Discovery};
|
|
15
|
+
use crate::gui::connection::{Connection, Discovery};
|
|
16
16
|
use std::sync::Arc;
|
|
17
17
|
|
|
18
18
|
/// A change to the selection of one panel. Rows are named by their key.
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
//! AWS connections: the environment and the profiles in `~/.aws`.
|
|
2
2
|
|
|
3
3
|
use super::{Connection, Discovery, Host, Login, Provider, Source, SsoLogin};
|
|
4
|
+
use crate::backend::{Vars, profile_files, profile_settings};
|
|
4
5
|
use aws_config::profile::ProfileSet;
|
|
5
6
|
use aws_runtime::env_config::file::EnvConfigFiles;
|
|
6
7
|
use aws_types::os_shim_internal::Fs;
|
|
7
8
|
use futures::FutureExt;
|
|
9
|
+
use std::collections::HashMap;
|
|
8
10
|
use std::path::PathBuf;
|
|
9
11
|
|
|
10
12
|
/// The scope the AWS CLI registers a session with when it names none.
|
|
@@ -129,6 +131,7 @@ pub(super) fn profiles(host: &Host, out: &mut Discovery) {
|
|
|
129
131
|
.iter()
|
|
130
132
|
.filter_map(|key| Some(((*key).to_owned(), host.var(key)?)))
|
|
131
133
|
.collect(),
|
|
134
|
+
endpoint: profile_endpoint(name, config.as_ref(), credentials.as_ref()),
|
|
132
135
|
},
|
|
133
136
|
login: sso_login(&set, name).map(Login::AwsSso),
|
|
134
137
|
});
|
|
@@ -141,6 +144,30 @@ pub(super) fn profiles(host: &Host, out: &mut Discovery) {
|
|
|
141
144
|
}
|
|
142
145
|
}
|
|
143
146
|
|
|
147
|
+
/// The S3 `endpoint_url` of `name`, read now from the files the connection's
|
|
148
|
+
/// client will read (the same `AWS_CONFIG_FILE` and `AWS_SHARED_CREDENTIALS_FILE`
|
|
149
|
+
/// paths), so the TLS indicator never reads files while drawing.
|
|
150
|
+
fn profile_endpoint(
|
|
151
|
+
name: &str,
|
|
152
|
+
config: Option<&PathBuf>,
|
|
153
|
+
credentials: Option<&PathBuf>,
|
|
154
|
+
) -> Option<String> {
|
|
155
|
+
let mut paths = HashMap::new();
|
|
156
|
+
if let Some(path) = config {
|
|
157
|
+
paths.insert("AWS_CONFIG_FILE".to_owned(), path.display().to_string());
|
|
158
|
+
}
|
|
159
|
+
if let Some(path) = credentials {
|
|
160
|
+
paths.insert(
|
|
161
|
+
"AWS_SHARED_CREDENTIALS_FILE".to_owned(),
|
|
162
|
+
path.display().to_string(),
|
|
163
|
+
);
|
|
164
|
+
}
|
|
165
|
+
let vars = Vars::map(paths);
|
|
166
|
+
profile_settings(name, profile_files(&vars), false)
|
|
167
|
+
.ok()
|
|
168
|
+
.and_then(|settings| settings.s3_endpoint)
|
|
169
|
+
}
|
|
170
|
+
|
|
144
171
|
/// The device-login settings of an SSO profile, or of the SSO profile a role
|
|
145
172
|
/// profile takes its credentials from (`source_profile`, a few hops at most):
|
|
146
173
|
/// from its `sso-session` section when it names one, else (legacy) from the
|
|
@@ -429,6 +456,26 @@ aws_secret_access_key = minio123
|
|
|
429
456
|
/// Several profiles on one start URL, the common multi-account setup: each
|
|
430
457
|
/// is its own connection, and those that share a login share one token
|
|
431
458
|
/// cache entry (the identifier names the file, as with the AWS CLI).
|
|
459
|
+
#[test]
|
|
460
|
+
fn a_profile_endpoint_is_read_once_at_discovery() {
|
|
461
|
+
let dir = tempfile::tempdir().expect("tempdir");
|
|
462
|
+
write(&dir.path().join(".aws/config"), CONFIG);
|
|
463
|
+
write(
|
|
464
|
+
&dir.path().join(".aws/credentials"),
|
|
465
|
+
"[extra]\naws_access_key_id = AKIDEXTRA\naws_secret_access_key = s\n",
|
|
466
|
+
);
|
|
467
|
+
let found = scan(&host(dir.path(), &[]));
|
|
468
|
+
let endpoint = |name: &str| match &find(&found, name).source {
|
|
469
|
+
Source::AwsProfile { endpoint, .. } => endpoint.clone(),
|
|
470
|
+
other => panic!("not a profile: {other:?}"),
|
|
471
|
+
};
|
|
472
|
+
assert_eq!(
|
|
473
|
+
endpoint("minio").as_deref(),
|
|
474
|
+
Some("http://minio.local:9000")
|
|
475
|
+
);
|
|
476
|
+
assert_eq!(endpoint("extra"), None);
|
|
477
|
+
}
|
|
478
|
+
|
|
432
479
|
#[test]
|
|
433
480
|
fn profiles_sharing_a_start_url_each_get_a_connection_and_share_the_login() {
|
|
434
481
|
let dir = tempfile::tempdir().expect("tempdir");
|
|
@@ -76,6 +76,9 @@ pub enum Source {
|
|
|
76
76
|
/// `AWS_DEFAULT_REGION`) of the process environment at discovery, as
|
|
77
77
|
/// (name, value). They take precedence over the profile's region.
|
|
78
78
|
regions: Vec<(String, String)>,
|
|
79
|
+
/// The profile's S3 `endpoint_url`, read once at discovery from the
|
|
80
|
+
/// same files the client reads. The environment's endpoint still wins.
|
|
81
|
+
endpoint: Option<String>,
|
|
79
82
|
},
|
|
80
83
|
Gcs {
|
|
81
84
|
credentials: PathBuf,
|
|
@@ -131,7 +134,7 @@ impl Connection {
|
|
|
131
134
|
/// The settings of an isolated client: only what the connection names, so
|
|
132
135
|
/// the process environment (`S3_ENDPOINT`, `AWS_PROFILE`, ...) cannot leak
|
|
133
136
|
/// in. `None` for [`Source::Env`], which is the process environment.
|
|
134
|
-
fn vars(&self) -> Option<HashMap<String, String>> {
|
|
137
|
+
pub(crate) fn vars(&self) -> Option<HashMap<String, String>> {
|
|
135
138
|
let mut vars = HashMap::new();
|
|
136
139
|
let mut set = |key: &str, value: String| vars.insert(key.to_owned(), value);
|
|
137
140
|
match &self.source {
|
|
@@ -378,6 +381,7 @@ mod tests {
|
|
|
378
381
|
credentials: None,
|
|
379
382
|
process_endpoint: false,
|
|
380
383
|
regions: Vec::new(),
|
|
384
|
+
endpoint: None,
|
|
381
385
|
},
|
|
382
386
|
login: None,
|
|
383
387
|
}
|
|
@@ -7,7 +7,7 @@ use std::sync::Arc;
|
|
|
7
7
|
use std::time::Duration;
|
|
8
8
|
|
|
9
9
|
use crate::backend::ObjectState;
|
|
10
|
-
use crate::connection::Connection;
|
|
10
|
+
use crate::gui::connection::Connection;
|
|
11
11
|
|
|
12
12
|
/// How the opened client encrypts, and where its keys came from.
|
|
13
13
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
//! The connection list, the address field and Go.
|
|
2
2
|
|
|
3
|
+
use super::security;
|
|
3
4
|
use crate::gui::action::Action;
|
|
4
5
|
use crate::gui::display;
|
|
5
6
|
use crate::gui::model::{AppState, Side};
|
|
@@ -13,6 +14,9 @@ pub(in crate::gui) fn address_id(side: Side) -> egui::Id {
|
|
|
13
14
|
pub(super) fn draw(ui: &mut egui::Ui, state: &AppState, side: Side, actions: &mut Vec<Action>) {
|
|
14
15
|
let panel = &state.panels[side.index()];
|
|
15
16
|
ui.horizontal(|ui| {
|
|
17
|
+
let tls = security::tls_state(&panel.connection);
|
|
18
|
+
ui.label(security::tls_icon(tls))
|
|
19
|
+
.on_hover_text(security::tls_hover(tls));
|
|
16
20
|
egui::ComboBox::from_id_salt(("osc-gui connection", side.index()))
|
|
17
21
|
.selected_text(display::text(&panel.connection.label))
|
|
18
22
|
.show_ui(ui, |ui| {
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
use super::address_bar;
|
|
4
4
|
use crate::backend::ObjectState;
|
|
5
|
-
use crate::connection::Login;
|
|
6
5
|
use crate::gui::action::{Action, SelectOp};
|
|
6
|
+
use crate::gui::connection::Login;
|
|
7
7
|
use crate::gui::display;
|
|
8
8
|
use crate::gui::model::{AppState, Entry, MAX_ENTRIES, PanelState, Side, unavailable_reason};
|
|
9
9
|
use eframe::egui;
|