Skip to content

Commit

Permalink
Release unftp version 0.12.9
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesdejager committed May 2, 2021
1 parent 785ffd4 commit 67d9f22
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 16 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Changelog

## 2021-05-02 unftp v0.12.9

_tag: v0.12.9_

- Added Mutual TLS support with the addition of the `--ftps-client-auth` and `--ftps-trust-store` arguments.
- The JSON authentication method (`--auth-json-path`) now supports encryption through
[PBKDF2](https://tools.ietf.org/html/rfc2898#section-5.2) encoded passwords. See the
[unftp-auth-jsonfile](https://docs.rs/unftp-auth-jsonfile/0.1.1/unftp_auth_jsonfile/) documentation for an example.
10 changes: 5 additions & 5 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "unftp"
version = "0.12.8"
version = "0.12.9"
authors = [
"Agoston Horvath <[email protected]>",
"Dávid Kosztka <[email protected]>",
Expand Down Expand Up @@ -45,7 +45,7 @@ unftp-auth-rest = { version = "0.1", optional = true }
unftp-auth-jsonfile = { version = "0.1.1", optional = true }

## Build conflict fixes
tracing = "0.1.25"
tracing = "0.1.26"

[target.'cfg(unix)'.dependencies]
unftp-auth-pam = { version = "0.1", optional = true }
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ you can choose between a statically linked image (no PAM integration) or a dynam
Linux (static, no PAM):

```sh
curl -L https://github.com/bolcom/unFTP/releases/download/v0.12.8/unftp_x86_64-unknown-linux-musl \
curl -L https://github.com/bolcom/unFTP/releases/download/v0.12.9/unftp_x86_64-unknown-linux-musl \
| sudo tee /usr/local/bin/unftp > /dev/null && sudo chmod +x /usr/local/bin/unftp
```

Linux (dynamic with PAM support):

```sh
curl -L https://github.com/bolcom/unFTP/releases/download/v0.12.8/unftp_x86_64-unknown-linux-gnu \
curl -L https://github.com/bolcom/unFTP/releases/download/v0.12.9/unftp_x86_64-unknown-linux-gnu \
| sudo tee /usr/local/bin/unftp > /dev/null && sudo chmod +x /usr/local/bin/unftp
```

macOS:

```sh
curl -L https://github.com/bolcom/unFTP/releases/download/v0.12.8/unftp_x86_64-apple-darwin \
curl -L https://github.com/bolcom/unFTP/releases/download/v0.12.9/unftp_x86_64-apple-darwin \
| sudo tee /usr/local/bin/unftp > /dev/null && sudo chmod +x /usr/local/bin/unftp
```

Expand Down Expand Up @@ -203,9 +203,9 @@ make docker-image-alpine
Alternatively you can download pre-made images from docker hub e.g.:

```sh
docker pull bolcom/unftp:v0.12.8-alpine
docker pull bolcom/unftp:v0.12.8-alpine-istio
docker pull bolcom/unftp:v0.12.8-scratch
docker pull bolcom/unftp:v0.12.9-alpine
docker pull bolcom/unftp:v0.12.9-alpine-istio
docker pull bolcom/unftp:v0.12.9-scratch
```

Example running it:
Expand All @@ -232,7 +232,7 @@ docker run \
-v /Users/xxx/unftp/unftp.crt:/unftp.crt \
-v /Users/xxx/unftp/the-key.json:/key.json \
-ti \
bolcom/unftp:v0.12.8-alpine
bolcom/unftp:v0.12.9-alpine
```

## Getting help and staying informed
Expand Down
22 changes: 22 additions & 0 deletions RELEASE-CHECKLIST.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Release Checklist

* Update minor versions dependencies
* Update Cargo.toml with the new version number
* Search for the old version number to find references to it in documentation and update those occurrences.
* Run `make pr-prep`, ensuring everything is green
* Prepare release notes for the Github release page
* Make a new commit (don't push) indicating the crate name and version number e.g.
> Release unftp version x.y.x
or

> Release slog-redis version x.y.x
* Run `make publish`
* Push to Github
* Create the release in Github using tag format \[{component}-\]{version} e.g.
> v0.12.9
or
> slog-redis-v0.1.2
* Create the artifacts: `make release-artifacts` and add to Github
* Build and push the docker containers
* Notify the Telegram channel.
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -364,13 +364,13 @@ where
}
(FtpsClientAuthType::request, Some(file)) => {
if !PathBuf::from(file).exists() {
return Err(format!("file specified for --{} not found", args::FTPS_TRUST_STORE))?;
return Err(format!("file specified for --{} not found", args::FTPS_TRUST_STORE));
}
server.ftps_client_auth(FtpsClientAuth::Request).ftps_trust_store(file)
}
(FtpsClientAuthType::require, Some(file)) => {
if !PathBuf::from(file).exists() {
return Err(format!("file specified for --{} not found", args::FTPS_TRUST_STORE))?;
return Err(format!("file specified for --{} not found", args::FTPS_TRUST_STORE));
}
server.ftps_client_auth(FtpsClientAuth::Require).ftps_trust_store(file)
}
Expand Down

0 comments on commit 67d9f22

Please sign in to comment.