Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Repository overview

The GitHub repository is [bolcom/libunftp](https://github.com/bolcom/libunftp).
The GitHub repository is [Cloudinvoke/libunftp](https://github.com/Cloudinvoke/libunftp).

This repository is a Rust Cargo workspace for libunftp, an asynchronous and extensible FTP(S) server library.

Expand Down Expand Up @@ -301,7 +301,7 @@ For a release:
- Search for old version strings, including `html_root_url` and documentation examples.
- Update the relevant changelog entries.
- When updating changelogs or release notes, look up the associated merged GitHub pull requests
(PRs/MRs) and link entries to them where available, following the existing `[#123](https://github.com/bolcom/libunftp/pull/123)` style.
(PRs/MRs) and link entries to them where available, following the existing `[#123](https://github.com/Cloudinvoke/libunftp/pull/123)` style.
Verify the association using GitHub metadata or commit history; do not invent PR numbers.
- Run `make pr-prep`.
- Use release commits naming the crate and version.
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

### Unreleased

- Move libunftp and unFTP from bol.com to [CloudInvoke](https://github.com/Cloudinvoke).
The GitHub repository is now [Cloudinvoke/libunftp](https://github.com/Cloudinvoke/libunftp).
- [#601](https://github.com/bolcom/libunftp/pull/601) Upgrade `base64` to 0.23.1 for the JSON-file
authenticator, and the filesystem backend's test dependencies to `nix` 0.31.3
and `rstest` 0.28.0. These backend releases are pending.
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [
]
description = "Extensible, async, cloud orientated FTP(S) server library."
documentation = "https://docs.rs/libunftp/"
repository = "https://github.com/bolcom/libunftp"
repository = "https://github.com/Cloudinvoke/libunftp"
homepage = "https://unftp.rs/"
license = "Apache-2.0"
readme = "README.md"
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# [libunftp](https://github.com/bolcom/libunftp)
# [libunftp](https://github.com/Cloudinvoke/libunftp)

[![Crate Version](https://img.shields.io/crates/v/libunftp.svg)](https://crates.io/crates/libunftp)
[![API Docs](https://docs.rs/libunftp/badge.svg)](https://docs.rs/libunftp)
[![Build Status](https://github.com/bolcom/libunftp/actions/workflows/rust.yml/badge.svg?branch=master)](https://github.com/bolcom/libunftp/actions/workflows/rust.yml)
[![Build Status](https://github.com/Cloudinvoke/libunftp/actions/workflows/rust.yml/badge.svg?branch=master)](https://github.com/Cloudinvoke/libunftp/actions/workflows/rust.yml)
[![Crate License](https://img.shields.io/crates/l/libunftp.svg)](https://crates.io/crates/libunftp)
[![Follow on Telegram](https://img.shields.io/badge/Follow%20on-Telegram-brightgreen.svg)](https://t.me/unftp)

When you need to FTP, but don't want to.

![logo](logo.png)

[**Website**](https://unftp.rs) | [**API Docs**](https://docs.rs/libunftp) | [**unFTP**](https://github.com/bolcom/unFTP)
[**Website**](https://unftp.rs) | [**API Docs**](https://docs.rs/libunftp) | [**unFTP**](https://github.com/Cloudinvoke/unFTP)

The libunftp library drives [unFTP](https://github.com/bolcom/unFTP). It's an extensible, async, cloud orientated FTP(S)
server implementation in [Rust](https://rust-lang.org) brought to you by the [bol.com techlab](https://techlab.bol.com).
The libunftp library drives [unFTP](https://github.com/Cloudinvoke/unFTP). It's an extensible, async, cloud orientated FTP(S)
server implementation in [Rust](https://rust-lang.org), maintained under [CloudInvoke](https://github.com/Cloudinvoke)
by [Hannes de Jager](https://github.com/hannesdejager) and [Rob klein Gunnewiek](https://github.com/robklg).

Because of its plug-able authentication (e.g. PAM, JSON File, Generic REST) and storage
backends (e.g. local filesystem, [Google Cloud Storage](https://cloud.google.com/storage)) it's
Expand Down Expand Up @@ -167,13 +168,13 @@ For more help refer to:

- the [examples](./examples) directory.
- the [API Documentation](https://docs.rs/libunftp).
- [unFTP server](https://github.com/bolcom/unFTP), a server from the bol.com techlab that is built on top of libunftp.
- [unFTP server](https://github.com/Cloudinvoke/unFTP), a server built on top of libunftp.
- this [blog post](https://blog.abstractinvoke.com/05-07-unftp.html) about libunftp and unFTP.

## Getting help and staying informed

Support is given on a best effort basis. You are welcome to engage us
on [the discussions page](https://github.com/bolcom/libunftp/discussions)
on [the discussions page](https://github.com/Cloudinvoke/libunftp/discussions)
or create a Github issue.

You can also follow news and talk to us on [Telegram](https://t.me/unftp)
Expand Down
2 changes: 1 addition & 1 deletion RELEASE-CHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
of leading, embedded, and trailing whitespace, including paths following LIST options and `--`.
* Before releasing libunftp itself, run unFTP while pointing to the new version of libunftp
* Update CHANGELOG.md for all the crates affected. Link entries to associated merged pull requests
where available using `[#123](https://github.com/bolcom/libunftp/pull/123)`; verify associations
where available using `[#123](https://github.com/Cloudinvoke/libunftp/pull/123)`; verify associations
against GitHub metadata or commit history.
* Prepare release notes for the GitHub release page. Do not start with a
markdown heading (GitHub already shows the release name as a heading).
Expand Down
4 changes: 2 additions & 2 deletions crates/unftp-auth-jsonfile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ license = "Apache-2.0"
keywords = ["libunftp", "unftp", "ftp", "ftps", "json"]
categories = ["network-programming"]
documentation = "https://docs.rs/unftp-auth-jsonfile"
homepage = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-auth-jsonfile"
repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-auth-jsonfile"
homepage = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-auth-jsonfile"
repository = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-auth-jsonfile"
readme = "README.md"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/unftp-auth-jsonfile/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Crate License](https://img.shields.io/crates/l/unftp-auth-jsonfile.svg)](https://crates.io/crates/unftp-auth-jsonfile)
[![Follow on Telegram](https://img.shields.io/badge/Follow%20on-Telegram-brightgreen.svg)](https://t.me/unftp)

An authenticator back-end for [libunftp](https://github.com/bolcom/libunftp) that authenticates against a JSON file.
An authenticator back-end for [libunftp](https://github.com/Cloudinvoke/libunftp) that authenticates against a JSON file.

## License

Expand Down
4 changes: 2 additions & 2 deletions crates/unftp-auth-pam/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ license = "Apache-2.0"
keywords = ["libunftp", "unftp", "ftp", "ftps", "pam"]
categories = ["network-programming"]
documentation = "https://docs.rs/unftp-auth-pam"
homepage = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-auth-pam"
repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-auth-pam"
homepage = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-auth-pam"
repository = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-auth-pam"
readme = "README.md"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/unftp-auth-pam/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Crate License](https://img.shields.io/crates/l/unftp-auth-pam.svg)](https://crates.io/crates/unftp-auth-pam)
[![Follow on Telegram](https://img.shields.io/badge/Follow%20on-Telegram-brightgreen.svg)](https://t.me/unftp)

An authenticator back-end for [libunftp](https://github.com/bolcom/libunftp) that authenticates against
An authenticator back-end for [libunftp](https://github.com/Cloudinvoke/libunftp) that authenticates against
[PAM](https://en.wikipedia.org/wiki/Pluggable_authentication_module).

## License
Expand Down
4 changes: 2 additions & 2 deletions crates/unftp-auth-rest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ license = "Apache-2.0"
keywords = ["libunftp", "ftp", "ftps", "auth", "rest"]
categories = ["network-programming"]
documentation = "https://docs.rs/unftp-auth-rest"
homepage = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-auth-rest"
repository = "https://github.com/bolcom/libunftp/tree/hannes/crates/unftp-auth-rest"
homepage = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-auth-rest"
repository = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-auth-rest"
readme = "README.md"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/unftp-auth-rest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Crate License](https://img.shields.io/crates/l/unftp-auth-rest.svg)](https://crates.io/crates/unftp-auth-rest)
[![Follow on Telegram](https://img.shields.io/badge/Follow%20on-Telegram-brightgreen.svg)](https://t.me/unftp)

An authenticator back-end for [libunftp](https://github.com/bolcom/libunftp) that consumes an HTTP API to
An authenticator back-end for [libunftp](https://github.com/Cloudinvoke/libunftp) that consumes an HTTP API to
authenticate. Please refer to the documentation and the examples directory for usage instructions.

## License
Expand Down
2 changes: 1 addition & 1 deletion crates/unftp-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ keywords = ["libunftp", "unftp", "ftp", "ftps"]
categories = ["network-programming"]
documentation = "https://docs.rs/unftp-core"
homepage = "https://unftp.rs/"
repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-core"
repository = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-core"
readme = "README.md"

[dependencies]
Expand Down
6 changes: 3 additions & 3 deletions crates/unftp-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@

When you need to FTP, but don't want to.

![unFTP logo](https://raw.githubusercontent.com/bolcom/libunftp/master/logo.png)
![unFTP logo](https://raw.githubusercontent.com/Cloudinvoke/libunftp/master/logo.png)

[**Website**](https://unftp.rs) | [**API docs**](https://docs.rs/unftp-core) |
[**libunftp**](https://github.com/bolcom/libunftp) | [**unFTP server**](https://github.com/bolcom/unFTP)
[**libunftp**](https://github.com/Cloudinvoke/libunftp) | [**unFTP server**](https://github.com/Cloudinvoke/unFTP)

This crate contains the core traits and types for [unFTP](https://unftp.rs/) backends (extensions).

## About the wider unFTP project

unFTP is an open-source, cloud-focused FTP and FTPS server project. It is an FTP server, not an SFTP server. You can run
the standalone [unFTP server](https://github.com/bolcom/unFTP), embed the [libunftp library](https://github.com/bolcom/libunftp) in your application and add existing extensions or create your own extensions. Its pluggable authentication, storage, user-detail providers and other extensions let you connect the server to the systems your application uses.
the standalone [unFTP server](https://github.com/Cloudinvoke/unFTP), embed the [libunftp library](https://github.com/Cloudinvoke/libunftp) in your application and add existing extensions or create your own extensions. Its pluggable authentication, storage, user-detail providers and other extensions let you connect the server to the systems your application uses.

## About `unftp-core`

Expand Down
4 changes: 2 additions & 2 deletions crates/unftp-sbe-fs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ license = "Apache-2.0"
keywords = ["libunftp", "unftp", "ftp", "ftps", "filesystem"]
categories = ["network-programming"]
documentation = "https://docs.rs/unftp-sbe-fs"
homepage = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-sbe-fs"
repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-sbe-fs"
homepage = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-sbe-fs"
repository = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-sbe-fs"
readme = "README.md"

[dependencies]
Expand Down
6 changes: 3 additions & 3 deletions crates/unftp-sbe-fs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![Follow on Telegram](https://img.shields.io/badge/Follow%20on-Telegram-brightgreen.svg)](https://t.me/unftp)

This unftp-sbe-fs crate allows you to use a regular Filesystem with
[libunftp](https://github.com/bolcom/libunftp) and work like a regular
[libunftp](https://github.com/Cloudinvoke/libunftp) and work like a regular
FTP server.

## Getting started
Expand Down Expand Up @@ -56,12 +56,12 @@ For more help refer to:

- the [examples](./examples) directory.
- the [API Documentation](https://docs.rs/unftp-sbe-fs/latest/unftp_sbe_fs/).
- [unFTP server](https://github.com/bolcom/unFTP), a server from the bol.com techlab that is built on top of libunftp.
- [unFTP server](https://github.com/Cloudinvoke/unFTP), a server built on top of libunftp.

## Getting help and staying informed

Support is given on a best effort basis. You are welcome to engage us
on [the discussions page](https://github.com/bolcom/libunftp/discussions)
on [the discussions page](https://github.com/Cloudinvoke/libunftp/discussions)
or create a Github issue.

You can also follow news and talk to us on [Telegram](https://t.me/unftp)
Expand Down
4 changes: 2 additions & 2 deletions crates/unftp-sbe-gcs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ license = "Apache-2.0"
keywords = ["libunftp", "unftp", "ftp", "ftps", "gcs"]
categories = ["network-programming"]
documentation = "https://docs.rs/unftp-sbe-gcs"
homepage = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-sbe-gcs"
repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-sbe-gcs"
homepage = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-sbe-gcs"
repository = "https://github.com/Cloudinvoke/libunftp/tree/master/crates/unftp-sbe-gcs"
readme = "README.md"

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions crates/unftp-sbe-gcs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Crate License](https://img.shields.io/crates/l/unftp-sbe-gcs.svg)](https://crates.io/crates/unftp-sbe-gcs)
[![Follow on Telegram](https://img.shields.io/badge/Follow%20on-Telegram-brightgreen.svg)](https://t.me/unftp)

An storage back-end for [libunftp](https://github.com/bolcom/libunftp) that let you store files
An storage back-end for [libunftp](https://github.com/Cloudinvoke/libunftp) that let you store files
in [Google Cloud Storage](https://cloud.google.com/storage).
Please refer to the documentation and the examples directory for usage instructions.

Expand Down Expand Up @@ -47,7 +47,7 @@ the [libunftp API documentation](https://docs.rs/libunftp/latest/libunftp/).
## Getting help and staying informed

Support is given on a best effort basis. You are welcome to engage us
on [Github the discussions page](https://github.com/bolcom/libunftp/discussions)
on [Github the discussions page](https://github.com/Cloudinvoke/libunftp/discussions)
or create a Github issue.

You can also follow news and talk to us on [Telegram](https://t.me/unftp)
Expand Down
2 changes: 1 addition & 1 deletion crates/unftp-sbe-gcs/examples/gcs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub async fn main() -> Result<(), Box<dyn Error>> {

let matches = Command::new("Example for using libunftp with Google Cloud Storage backend with optionally enabling TLS")
.about("An FTP server that uses Google Cloud Storage as a backend")
.author("The bol.com unFTP team")
.author("The CloudInvoke unFTP team")
.arg(
Arg::new(BUCKET_NAME)
.short('b')
Expand Down
2 changes: 1 addition & 1 deletion crates/unftp-sbe-gcs/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(clippy::unnecessary_wraps)]

//! An storage back-end for [libunftp](https://github.com/bolcom/libunftp) that let you store files
//! An storage back-end for [libunftp](https://github.com/Cloudinvoke/libunftp) that let you store files
//! in [Google Cloud Storage](https://cloud.google.com/storage).
//!
//! # Usage
Expand Down
4 changes: 2 additions & 2 deletions crates/unftp-sbe-gcs/src/workload_identity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ use crate::gcs_client::HttpClientEmpty;
// When is using the IP better?
const METADATA_HOST: &str = "metadata.google.internal";

// `github.com/bolcom/libunftp v{package_version}`
const USER_AGENT: &str = concat!("github.com/bolcom/libunftp v", env!("CARGO_PKG_VERSION"));
// `github.com/Cloudinvoke/libunftp v{package_version}`
const USER_AGENT: &str = concat!("github.com/Cloudinvoke/libunftp v", env!("CARGO_PKG_VERSION"));

pub(super) async fn request_token(service: Option<String>, client: HttpClientEmpty) -> Result<TokenResponse, Error> {
// Does same as curl -s -HMetadata-Flavor:Google http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/token
Expand Down
Loading