diff --git a/0001-fix-build-for-pytest.patch b/0001-fix-build-for-pytest.patch deleted file mode 100644 index 4aeb35a447bb422c27c6d17266856bd4225fc9a9..0000000000000000000000000000000000000000 --- a/0001-fix-build-for-pytest.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2ecfbe1d82ef2bcb6bba3d9d8a71dcc8e7811021 Mon Sep 17 00:00:00 2001 -From: baizg1107 -Date: Tue, 12 Jan 2021 11:18:35 +0800 -Subject: [PATCH] fix build for pytest - ---- - tests/conftest.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tests/conftest.py b/tests/conftest.py -index c25e302..6a977ec 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -34,6 +34,11 @@ def pytest_addoption(parser): - - def pytest_runtest_setup(item): - skip_servertest = item.config.getoption(SKIP_SERVERTEST) -- if skip_servertest and item.get_marker("servertest") is not None: -+ #pytest 4+ -+ if hasattr(item, 'get_closest_marker'): -+ get_marker = item.get_closest_marker -+ else: -+ get_marker = item.get_marker -+ if skip_servertest and get_marker("servertest") is not None: - # args has --skip-servertests and test is marked as servertest - pytest.skip("Skip integration test") --- -2.23.0 - diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 95f9018468a5f90bbc7a3f4eab24e014341060ff..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# custodia - -#### Description -A tool for managing secrets other processes - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 16ff7701ec64a309fc023a1955909348f68d8cd9..b51b18725a88f4c7b3655fc12f9703f3140b08df 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,3 @@ -# custodia +Deprecated since Sep 2025 -#### 介绍 -A tool for managing secrets other processes - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) +- https://gitee.com/openeuler/release-management/pulls/2391 diff --git a/custodia-0.6.0.tar.gz b/custodia-0.6.0.tar.gz deleted file mode 100644 index d8ebfcaf46429bb43faf8d4323b5bfef06e8b514..0000000000000000000000000000000000000000 Binary files a/custodia-0.6.0.tar.gz and /dev/null differ diff --git a/custodia.conf b/custodia.conf deleted file mode 100644 index 5e4b584ebd4a31a7c1452fb7d11b663b747c0ef0..0000000000000000000000000000000000000000 --- a/custodia.conf +++ /dev/null @@ -1,32 +0,0 @@ -# /etc/custodia/custodia.conf -[global] -debug = true -makedirs = true - -[store:sqlite] -handler = SqliteStore -dburi = ${libdir}/secrets.db -table = secrets - -[store:encrypted_sqlite] -handler = EncryptedOverlay -backing_store = sqlite -master_key = ${libdir}/secrets.key -master_enctype = A128CBC-HS256 -autogen_master_key = true - -[auth:creds] -handler = SimpleCredsAuth -uid = root -gid = root - -[authz:paths] -handler = SimplePathAuthz -paths = /. /secrets - -[/] -handler = Root - -[/secrets] -handler = Secrets -store = encrypted_sqlite diff --git a/custodia.spec b/custodia.spec deleted file mode 100644 index 2d8afe809eedbc99863aa14c5d6931d65238ef4e..0000000000000000000000000000000000000000 --- a/custodia.spec +++ /dev/null @@ -1,144 +0,0 @@ -Name: custodia -Version: 0.6.0 -Release: 8 -Summary: A tool for managing secrets other processes -License: GPLv3+ -URL: https://github.com/latchset/%{name} -Source0: https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source2: custodia.conf -Source3: custodia@.service -Source4: custodia@.socket -Source5: custodia.tmpfiles.conf -BuildArch: noarch - -Patch0: 0001-fix-build-for-pytest.patch - -BuildRequires: systemd python3-devel python3-jwcrypto >= 0.4.2 -BuildRequires: python3-requests python3-setuptools > 18 python3-coverage -BuildRequires: python3-pytest python3-docutils python3-systemd - -Requires: python3-custodia = %{version}-%{release} -Requires(preun): systemd-units -Requires(postun): systemd-units -Requires(post): systemd-units - -%description -A tool for managing secrets other processes - -Custodia is a project that aims to define an API for modern cloud applications -that allows to easily store and share password,tokens,certificates and any -other secret in a way that keeps data secure, manageable and auditable. - -Custodia is modular, the configuration file controls how authentication, -authorization, storage and API plugins are combined and exposed. - -%package -n python3-custodia -Summary: Sub-package with python3 custodia modules -%{?python_provide:%python_provide python3-%{name}} -Requires: python3-jwcrypto >= 0.4.2 python3-requests python3-setuptools python3-systemd -Conflicts: python3-custodia-extra < %{version} - -%description -n python3-custodia -Sub-package with python custodia modules - -Custodia is a project that aims to define an API for modern cloud applications -that allows to easily store and share password,tokens,certificates and any -other secret in a way that keeps data secure, manageable and auditable. - -Custodia is modular, the configuration file controls how authentication, -authorization, storage and API plugins are combined and exposed. - -%prep -%autosetup -n %{name}-%{version} -p1 - -%build -%py3_build - -%check -export PYTHONPATH="%{buildroot}/%{python3_sitelib}" -py.test --skip-servertests --ignore=tests/test_ipa.py --ignore=tests/test_cli.py - -%install -install -d %{buildroot}/%{_sbindir} -install -d %{buildroot}/%{_mandir}/man7 -install -d %{buildroot}/%{_defaultdocdir}/custodia -install -d %{buildroot}/%{_defaultdocdir}/custodia/examples -install -d %{buildroot}/%{_sysconfdir}/custodia -install -d %{buildroot}/%{_unitdir} -install -d %{buildroot}/%{_tmpfilesdir} -install -d %{buildroot}/%{_localstatedir}/lib/custodia -install -d %{buildroot}/%{_localstatedir}/log/custodia -install -d %{buildroot}/%{_localstatedir}/run/custodia - -%py3_install -mv %{buildroot}/%{_bindir}/custodia %{buildroot}/%{_sbindir}/custodia -cp %{buildroot}/%{_sbindir}/custodia %{buildroot}/%{_sbindir}/custodia-3 -cp %{buildroot}/%{_bindir}/custodia-cli %{buildroot}/%{_bindir}/custodia-cli-3 - -install -m 644 -t "%{buildroot}/%{_mandir}/man7" man/custodia.7 -install -m 644 -t "%{buildroot}/%{_defaultdocdir}/custodia" README API.md -install -m 644 -t "%{buildroot}/%{_defaultdocdir}/custodia/examples" custodia.conf -install -m 600 %{SOURCE2} %{buildroot}%{_sysconfdir}/custodia -install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_unitdir} -install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/custodia.conf - -%pre -getent group custodia >/dev/null || groupadd -r custodia -getent passwd custodia >/dev/null || \ - useradd -r -g custodia -d / -s /sbin/nologin \ - -c "User for custodia" custodia -exit 0 - -%post -for srv in `systemctl | awk '/custodia@.*\.service/{print $1} /custodia@.*\.socket/{print $1}'`; -do - %systemd_post $srv -done - -%preun -for srv in `systemctl | awk '/custodia@.*\.service/{print $1} /custodia@.*\.socket/{print $1}'`; -do - %systemd_preun $srv -done - -%postun -for srv in `systemctl | awk '/custodia@.*\.service/{print $1} /custodia@.*\.socket/{print $1}'`; -do - %systemd_postun_with_restart $srv -done - -%files -%doc README API.md LICENSE -%doc %{_defaultdocdir}/custodia/examples/custodia.conf -%{_mandir}/man7/custodia* -%{_sbindir}/custodia -%{_bindir}/custodia-cli -%dir %attr(0700,custodia,custodia) %{_sysconfdir}/custodia -%dir %attr(0700,custodia,custodia) %{_localstatedir}/lib/custodia -%dir %attr(0700,custodia,custodia) %{_localstatedir}/log/custodia -%dir %attr(0755,custodia,custodia) %{_localstatedir}/run/custodia -%config(noreplace) %attr(600,custodia,custodia) %{_sysconfdir}/custodia/custodia.conf -%attr(644,root,root) %{_unitdir}/custodia@.socket -%attr(644,root,root) %{_unitdir}/custodia@.service -%{_tmpfilesdir}/custodia.conf - -%files -n python3-custodia -%doc LICENSE -%{_sbindir}/custodia-3 -%{_bindir}/custodia-cli-3 -%{python3_sitelib}/%{name} -%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info -%{python3_sitelib}/%{name}-%{version}-py%{python3_version}-nspkg.pth - -%changelog -* Wed Jul 05 2023 chenchen - 0.6.0-8 -- modify %check for fix build error - -* Tue Mar 01 2022 xuping 0.6.0-7 -- Fix systemd related scriptlet error - -* Fri Jan 8 2021 baizhonggui 0.6.0-6 -- Fix building for pytest - -* Fri May 15 2020 Captain Wei 0.6.0-5 -- Package init diff --git a/custodia.tmpfiles.conf b/custodia.tmpfiles.conf deleted file mode 100644 index cacc03914f438b16b978b2939ebccba1827fbb97..0000000000000000000000000000000000000000 --- a/custodia.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/custodia 0755 custodia custodia diff --git a/custodia.yaml b/custodia.yaml deleted file mode 100644 index 0b7398c7cec54ce693cfa77305520867fb177234..0000000000000000000000000000000000000000 --- a/custodia.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: github -src_repo: latchset/custodia -tag_prefix: ^ -seperator: . diff --git a/custodia@.service b/custodia@.service deleted file mode 100644 index ef539f95193958a830d66b97261ad795d1876188..0000000000000000000000000000000000000000 --- a/custodia@.service +++ /dev/null @@ -1,21 +0,0 @@ -# /etc/systemd/system/custodia@.service - -[Unit] -Description=Custodia Secrets Service for %I -Documentation=https://github.com/latchset/custodia -Requires=custodia@%i.socket -After=network.target - -[Service] -Type=notify -ExecStart=/usr/sbin/custodia --instance=%i /etc/custodia/%i.conf -User=custodia -Group=custodia -ProtectSystem=full -ProtectHome=true -NoNewPrivileges=true -Restart=on-failure -RestartSec=30s - -[Install] -WantedBy=multi-user.target diff --git a/custodia@.socket b/custodia@.socket deleted file mode 100644 index fbd0fabcb4d06d554314cdf7e89e43fc8c7dd13f..0000000000000000000000000000000000000000 --- a/custodia@.socket +++ /dev/null @@ -1,18 +0,0 @@ -# /etc/systemd/system/custodia@.socket - -[Unit] -Description=Custodia Socket for %i -Documentation=https://github.com/latchset/custodia - -[Socket] -ListenStream=/var/run/custodia/%i.sock -Service=custodia@%i.service -RemoveOnStop=true -SocketUser=custodia -SocketGroup=custodia -SocketMode=0666 -PassCredentials=true -PassSecurity=true - -[Install] -WantedBy=sockets.target