diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 130d52ad..4cc32bd3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,9 +1,17 @@
Changelog
==========
+.. _2.6.4:
+
+2.6.4 - 2024-04-09
+~~~~~~~~~~~~~~~~~~~
+
+- Dependencies:
+ - `jwcrypto` from `1.5.1` to `1.5.6`
+
.. _2.6.3:
-2.6.2 - 2023-02-13
+2.6.3 - 2023-02-27
~~~~~~~~~~~~~~~~~~~
- Dependencies:
diff --git a/SPRINTLOG.md b/SPRINTLOG.md
index fa64980e..841dc11b 100644
--- a/SPRINTLOG.md
+++ b/SPRINTLOG.md
@@ -341,3 +341,11 @@ _Empty sprint_
# 2024-02-26 - 2024-03-08
- New extra release, outside maintenance window, version 2.6.3 ([#682](https://github.com/ScilifelabDataCentre/dds_cli/pull/682))
+
+# 2024-03-25 - 2024-04-5
+
+- Update jwcrypto package to address cve ([#1523](https://github.com/ScilifelabDataCentre/dds_web/pull/1523))
+
+# 2024-04-8 - 2024-04-19
+
+- New version: 2.6.4 ([#687](https://github.com/ScilifelabDataCentre/dds_cli/pull/687))
diff --git a/dds_cli/version.py b/dds_cli/version.py
index 4156df9e..37004aa7 100644
--- a/dds_cli/version.py
+++ b/dds_cli/version.py
@@ -2,4 +2,4 @@
# Do not change bump the major version unless absolutely necessary - makes incompatible with API
# If mid or minor version reaches 9, continue to 10, 11 etc.
-__version__ = "2.6.3"
+__version__ = "2.6.4"
diff --git a/img/dds-help-1.svg b/img/dds-help-1.svg
index 9d36da6d..47feca0d 100644
--- a/img/dds-help-1.svg
+++ b/img/dds-help-1.svg
@@ -19,140 +19,140 @@
font-weight: 700;
}
- .terminal-654495671-matrix {
+ .terminal-1400950712-matrix {
font-family: Fira Code, monospace;
font-size: 20px;
line-height: 24.4px;
font-variant-east-asian: full-width;
}
- .terminal-654495671-title {
+ .terminal-1400950712-title {
font-size: 18px;
font-weight: bold;
font-family: arial;
}
- .terminal-654495671-r1 { fill: #c5c8c6 }
-.terminal-654495671-r2 { fill: #868887;font-style: italic; }
-.terminal-654495671-r3 { fill: #c5c8c6;font-weight: bold }
-.terminal-654495671-r4 { fill: #d0b344;font-weight: bold }
-.terminal-654495671-r5 { fill: #68a0b3;font-weight: bold }
-.terminal-654495671-r6 { fill: #868887 }
-.terminal-654495671-r7 { fill: #4e707b;font-weight: bold }
-.terminal-654495671-r8 { fill: #98a84b;font-weight: bold }
-.terminal-654495671-r9 { fill: #8d7b39;font-weight: bold }
+ .terminal-1400950712-r1 { fill: #c5c8c6 }
+.terminal-1400950712-r2 { fill: #868887;font-style: italic; }
+.terminal-1400950712-r3 { fill: #c5c8c6;font-weight: bold }
+.terminal-1400950712-r4 { fill: #d0b344;font-weight: bold }
+.terminal-1400950712-r5 { fill: #68a0b3;font-weight: bold }
+.terminal-1400950712-r6 { fill: #868887 }
+.terminal-1400950712-r7 { fill: #4e707b;font-weight: bold }
+.terminal-1400950712-r8 { fill: #98a84b;font-weight: bold }
+.terminal-1400950712-r9 { fill: #8d7b39;font-weight: bold }
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -164,46 +164,46 @@
-
+
-
- $ dds
- ︵
- ︵ ( ) ︵
-( ) ) ( ( ) SciLifeLab Data Delivery System
- ︶ ( ) ) ( https://delivery.scilifelab.se/
- ︶ ( ) CLI Version 2.6.3
- ︶
-[..truncated..]
-Usage: dds [OPTIONS] COMMAND [ARGS]...
-
- SciLifeLab Data Delivery System (DDS) command line interface.
-Access token is saved in a .dds_cli_token file in the home directory.
-The token is valid for 7 days. Make sure your token is valid long enough for the delivery to
-finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating
-yourself before each delivery ('dds data put' / 'get').
-
-╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮
-│--verbose-v Print verbose output to the console. │
-│--log-file-l<filename> Save a log to a file. │
-│--no-prompt Run without any interactive features. │
-│--token-path-tpTEXT The path where the authentication token will be stored. For a │
-│ normal use-case, this should not be needed. │
-│--version Display the version of this software. │
-│--help List the options of any DDS subcommand and its default settings. │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮
-│auth Group command for creating and managing authenticated sessions (valid for 7 days). │
-│data Group command for uploading, downloading and managing project data. │
-│ls List the active projects you have access to or the project contents. │
-│maintenance [Super Admins only] Activate / Deactivate / Display status for Maintenance mode. │
-│motd [Super Admins only] Group command for managing Message of the Day within DDS. │
-│project Group command for creating and managing projects within the DDS. │
-│stats Get statistics in the DDS. │
-│unit [Super Admins only] Group command for managing units. │
-│user Group command for managing user accounts, including your own. │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-
+
+ $ dds
+ ︵
+ ︵ ( ) ︵
+( ) ) ( ( ) SciLifeLab Data Delivery System
+ ︶ ( ) ) ( https://delivery.scilifelab.se/
+ ︶ ( ) CLI Version 2.6.4
+ ︶
+[..truncated..]
+Usage: dds [OPTIONS] COMMAND [ARGS]...
+
+ SciLifeLab Data Delivery System (DDS) command line interface.
+Access token is saved in a .dds_cli_token file in the home directory.
+The token is valid for 7 days. Make sure your token is valid long enough for the delivery to
+finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating
+yourself before each delivery ('dds data put' / 'get').
+
+╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮
+│--verbose-v Print verbose output to the console. │
+│--log-file-l<filename> Save a log to a file. │
+│--no-prompt Run without any interactive features. │
+│--token-path-tpTEXT The path where the authentication token will be stored. For a │
+│ normal use-case, this should not be needed. │
+│--version Display the version of this software. │
+│--help List the options of any DDS subcommand and its default settings. │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮
+│auth Group command for creating and managing authenticated sessions (valid for 7 days). │
+│data Group command for uploading, downloading and managing project data. │
+│ls List the active projects you have access to or the project contents. │
+│maintenance [Super Admins only] Activate / Deactivate / Display status for Maintenance mode. │
+│motd [Super Admins only] Group command for managing Message of the Day within DDS. │
+│project Group command for creating and managing projects within the DDS. │
+│stats Get statistics in the DDS. │
+│unit [Super Admins only] Group command for managing units. │
+│user Group command for managing user accounts, including your own. │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+
diff --git a/img/dds-help-2.svg b/img/dds-help-2.svg
index fd1916c7..a3484f5e 100644
--- a/img/dds-help-2.svg
+++ b/img/dds-help-2.svg
@@ -19,140 +19,140 @@
font-weight: 700;
}
- .terminal-3074544090-matrix {
+ .terminal-3820999131-matrix {
font-family: Fira Code, monospace;
font-size: 20px;
line-height: 24.4px;
font-variant-east-asian: full-width;
}
- .terminal-3074544090-title {
+ .terminal-3820999131-title {
font-size: 18px;
font-weight: bold;
font-family: arial;
}
- .terminal-3074544090-r1 { fill: #c5c8c6 }
-.terminal-3074544090-r2 { fill: #868887;font-style: italic; }
-.terminal-3074544090-r3 { fill: #c5c8c6;font-weight: bold }
-.terminal-3074544090-r4 { fill: #d0b344;font-weight: bold }
-.terminal-3074544090-r5 { fill: #68a0b3;font-weight: bold }
-.terminal-3074544090-r6 { fill: #868887 }
-.terminal-3074544090-r7 { fill: #4e707b;font-weight: bold }
-.terminal-3074544090-r8 { fill: #98a84b;font-weight: bold }
-.terminal-3074544090-r9 { fill: #8d7b39;font-weight: bold }
+ .terminal-3820999131-r1 { fill: #c5c8c6 }
+.terminal-3820999131-r2 { fill: #868887;font-style: italic; }
+.terminal-3820999131-r3 { fill: #c5c8c6;font-weight: bold }
+.terminal-3820999131-r4 { fill: #d0b344;font-weight: bold }
+.terminal-3820999131-r5 { fill: #68a0b3;font-weight: bold }
+.terminal-3820999131-r6 { fill: #868887 }
+.terminal-3820999131-r7 { fill: #4e707b;font-weight: bold }
+.terminal-3820999131-r8 { fill: #98a84b;font-weight: bold }
+.terminal-3820999131-r9 { fill: #8d7b39;font-weight: bold }
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -164,46 +164,46 @@
-
+
-
- $ dds --help
- ︵
- ︵ ( ) ︵
-( ) ) ( ( ) SciLifeLab Data Delivery System
- ︶ ( ) ) ( https://delivery.scilifelab.se/
- ︶ ( ) CLI Version 2.6.3
- ︶
-[..truncated..]
-Usage: dds [OPTIONS] COMMAND [ARGS]...
-
- SciLifeLab Data Delivery System (DDS) command line interface.
-Access token is saved in a .dds_cli_token file in the home directory.
-The token is valid for 7 days. Make sure your token is valid long enough for the delivery to
-finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating
-yourself before each delivery ('dds data put' / 'get').
-
-╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮
-│--verbose-v Print verbose output to the console. │
-│--log-file-l<filename> Save a log to a file. │
-│--no-prompt Run without any interactive features. │
-│--token-path-tpTEXT The path where the authentication token will be stored. For a │
-│ normal use-case, this should not be needed. │
-│--version Display the version of this software. │
-│--help List the options of any DDS subcommand and its default settings. │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮
-│auth Group command for creating and managing authenticated sessions (valid for 7 days). │
-│data Group command for uploading, downloading and managing project data. │
-│ls List the active projects you have access to or the project contents. │
-│maintenance [Super Admins only] Activate / Deactivate / Display status for Maintenance mode. │
-│motd [Super Admins only] Group command for managing Message of the Day within DDS. │
-│project Group command for creating and managing projects within the DDS. │
-│stats Get statistics in the DDS. │
-│unit [Super Admins only] Group command for managing units. │
-│user Group command for managing user accounts, including your own. │
-╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
-
+
+ $ dds --help
+ ︵
+ ︵ ( ) ︵
+( ) ) ( ( ) SciLifeLab Data Delivery System
+ ︶ ( ) ) ( https://delivery.scilifelab.se/
+ ︶ ( ) CLI Version 2.6.4
+ ︶
+[..truncated..]
+Usage: dds [OPTIONS] COMMAND [ARGS]...
+
+ SciLifeLab Data Delivery System (DDS) command line interface.
+Access token is saved in a .dds_cli_token file in the home directory.
+The token is valid for 7 days. Make sure your token is valid long enough for the delivery to
+finish. To avoid that a delivery fails because of an expired token, we recommend reauthenticating
+yourself before each delivery ('dds data put' / 'get').
+
+╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮
+│--verbose-v Print verbose output to the console. │
+│--log-file-l<filename> Save a log to a file. │
+│--no-prompt Run without any interactive features. │
+│--token-path-tpTEXT The path where the authentication token will be stored. For a │
+│ normal use-case, this should not be needed. │
+│--version Display the version of this software. │
+│--help List the options of any DDS subcommand and its default settings. │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮
+│auth Group command for creating and managing authenticated sessions (valid for 7 days). │
+│data Group command for uploading, downloading and managing project data. │
+│ls List the active projects you have access to or the project contents. │
+│maintenance [Super Admins only] Activate / Deactivate / Display status for Maintenance mode. │
+│motd [Super Admins only] Group command for managing Message of the Day within DDS. │
+│project Group command for creating and managing projects within the DDS. │
+│stats Get statistics in the DDS. │
+│unit [Super Admins only] Group command for managing units. │
+│user Group command for managing user accounts, including your own. │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+
diff --git a/img/dds-version.svg b/img/dds-version.svg
index 4bbdbb31..9aa17f87 100644
--- a/img/dds-version.svg
+++ b/img/dds-version.svg
@@ -19,31 +19,31 @@
font-weight: 700;
}
- .terminal-1542600596-matrix {
+ .terminal-1543649173-matrix {
font-family: Fira Code, monospace;
font-size: 20px;
line-height: 24.4px;
font-variant-east-asian: full-width;
}
- .terminal-1542600596-title {
+ .terminal-1543649173-title {
font-size: 18px;
font-weight: bold;
font-family: arial;
}
- .terminal-1542600596-r1 { fill: #c5c8c6 }
-.terminal-1542600596-r2 { fill: #868887;font-style: italic; }
+ .terminal-1543649173-r1 { fill: #c5c8c6 }
+.terminal-1543649173-r2 { fill: #868887;font-style: italic; }
-
+
-
+
-
+
@@ -55,12 +55,12 @@
-
+
-
- $ dds --version
-[..truncated..]
-Data Delivery System, version 2.6.3
+
+ $ dds --version
+[..truncated..]
+Data Delivery System, version 2.6.4
diff --git a/requirements.txt b/requirements.txt
index 975b8e9d..e76c895d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ click==8.1.3
click-pathlib==2020.3.13.0
cryptography==42.0.4
immutabledict==2.2.1
-jwcrypto==1.5.1
+jwcrypto==1.5.6
prettytable==3.4.1
prompt-toolkit==3.0.31
PyNaCl==1.5.0