Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated zmq revocation notification feature #658

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove deprecated zmq revocation notification feature #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7544e0
remove zmq revocation actions feature
arkivm Sep 23, 2023
f789280
update fedora patch to remove zmq
arkivm Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 1 addition & 47 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ The following packages are required for building:
* `libarchive-devel`
* `openssl-devel`
* `tpm2-tss-devel`
* (optional for the `with-zmq` feature): `zeromq-devel`

To install, use the following command:
```
$ dnf install clang libarchive-devel openssl-devel tpm2-tss-devel zeromq-devel
$ dnf install clang libarchive-devel openssl-devel tpm2-tss-devel
```

For runtime, the following packages are required:
Expand All @@ -50,7 +49,6 @@ For runtime, the following packages are required:
* `tpm2-tss`
* `systemd` (to run as systemd service)
* `util-linux-core` (for the `mount` command)
* (optional for the `with-zmq` feature): `zeromq`

#### Debian and Ubuntu

Expand All @@ -61,12 +59,11 @@ For Debian and Ubuntu, use the following packages are required:
* `libssl-dev`
* `libtss2-dev`
* `pkg-config`
* (optional for the `with-zmq` feature): `libzmq3-dev`

To install, use the following command:

```
$ apt-get install libarchive-dev libclang-dev libssl-dev libtss2-dev libzmq3-dev pkg-config
$ apt-get install libarchive-dev libclang-dev libssl-dev libtss2-dev pkg-config
```

For runtime, the following packages are required:
Expand All @@ -75,7 +72,6 @@ For runtime, the following packages are required:
* `libarchive`
* `libssl`
* `libtss2-esys-3.0.2-0`
* (optional for the `with-zmq` feature): `libzmq3`
* `systemd` (to run as systemd service)

### Rust
Expand Down
3 changes: 1 addition & 2 deletions docker/fedora/keylime_rust.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ tpm2-abrmd \
tpm2-tools \
tpm2-tss \
tpm2-tss-devel \
uthash-devel \
czmq-devel"
uthash-devel"

RUN dnf makecache && \
dnf -y install $PKGS_DEPS && \
Expand Down
19 changes: 0 additions & 19 deletions keylime-agent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,6 @@ secure_size = "1m"
# environment variable.
extract_payload_zip = true

# Whether to listen for revocation notifications from the verifier via zeromq.
# Note: The agent supports receiving revocation notifications via REST API
# regardless of the value set here.
#
# To override enable_revocation_notifications, set
# KEYLIME_AGENT_ENABLE_REVOCATION_NOTIFICATIONS environment variable.
enable_revocation_notifications = false

# The path to the directory containing the pre-installed revocation action
# scripts. Ideally should point to an fixed/immutable location subject to
# attestation. The default is /usr/libexec/keylime.
Expand All @@ -143,17 +135,6 @@ enable_revocation_notifications = false
# environment variable.
revocation_actions_dir = "/usr/libexec/keylime"

# Revocation IP & Port used by the agent to receive revocation
# notifications from the verifier via zeromq.
# This is optional and used only when 'enable_revocation_notifications' is 'true'.
#
# To override revocation_notification_ip, set
# KEYLIME_AGENT_REVOCATION_NOTIFICATION_IP environment variable.
# To override revocation_notification_port, set
# KEYLIME_AGENT_REVOCATION_NOTIFICATION_PORT environment variable.
revocation_notification_ip = "127.0.0.1"
revocation_notification_port = 8992

# The path to the certificate to verify revocation messages received from the
# verifier. The path is relative to keylime_dir unless an absolute path is
# provided (i.e. starts with '/').
Expand Down
6 changes: 0 additions & 6 deletions keylime-agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ tokio = {version = "1.24", features = ["rt", "sync", "macros"]}
tss-esapi = {version = "7.2.0", features = ["generate-bindings"]}
thiserror = "1.0"
uuid = {version = "1.3", features = ["v4"]}
zmq = {version = "0.9.2", optional = true}
# wiremock was moved to be a regular dependency because optional
# dev-dependencies are not supported
# see: https://github.com/rust-lang/cargo/issues/1596
Expand All @@ -48,11 +47,6 @@ actix-rt = "2"
default = []
# this should change to dev-dependencies when we have integration testing
testing = ["wiremock"]
# Whether the agent should be compiled with support to listen for notification
# messages on ZeroMQ
#
# This feature is deprecated and will be removed on next major release
with-zmq = ["zmq"]
# Whether the agent should be compiled with support for python revocation
# actions loaded as modules, which is the only kind supported by the python
# agent (unless the enhancement-55 is implemented). See:
Expand Down
Loading
Loading