From 123fdc5baf36a884874ce36af54db14954904c7d Mon Sep 17 00:00:00 2001 From: Dedy Martadinata Date: Sat, 8 Oct 2022 00:22:20 +0700 Subject: [PATCH 1/8] docker: use the locally-downloaded assets Change the index to the local one to use the locally-downloaded fonts and css. --- .github/workflows/Dockerfile.ci.alpine | 2 ++ .github/workflows/Dockerfile.ci.debian | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Dockerfile.ci.alpine b/.github/workflows/Dockerfile.ci.alpine index d4cbde7..16022d9 100644 --- a/.github/workflows/Dockerfile.ci.alpine +++ b/.github/workflows/Dockerfile.ci.alpine @@ -39,6 +39,7 @@ RUN if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then \ # Web and App dir COPY docker-entrypoint.sh /docker-entrypoint.sh COPY lldap_config.docker_template.toml /lldap/ +COPY web/index_local.html web/index.html RUN cp target/lldap /lldap/ && \ cp target/migration-tool /lldap/ && \ cp -R web/index.html \ @@ -46,6 +47,7 @@ RUN cp target/lldap /lldap/ && \ web/static \ /lldap/app/ +WORKDIR /lldap RUN set -x \ && for file in $(cat /lldap/app/static/libraries.txt); do wget -P app/static "$file"; done \ && for file in $(cat /lldap/app/static/fonts/fonts.txt); do wget -P app/static/fonts "$file"; done \ diff --git a/.github/workflows/Dockerfile.ci.debian b/.github/workflows/Dockerfile.ci.debian index 47899fa..4beb101 100644 --- a/.github/workflows/Dockerfile.ci.debian +++ b/.github/workflows/Dockerfile.ci.debian @@ -39,6 +39,7 @@ RUN if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then \ # Web and App dir COPY docker-entrypoint.sh /docker-entrypoint.sh COPY lldap_config.docker_template.toml /lldap/ +COPY web/index_local.html web/index.html RUN cp target/lldap /lldap/ && \ cp target/migration-tool /lldap/ && \ cp -R web/index.html \ @@ -46,11 +47,12 @@ RUN cp target/lldap /lldap/ && \ web/static \ /lldap/app/ +WORKDIR /lldap RUN set -x \ && for file in $(cat /lldap/app/static/libraries.txt); do wget -P app/static "$file"; done \ && for file in $(cat /lldap/app/static/fonts/fonts.txt); do wget -P app/static/fonts "$file"; done \ - && chmod a+r -R . - + && chmod a+r -R . + FROM debian:bullseye-slim ENV UID=1000 ENV GID=1000 From 2f9ea4f10f770323b44a76bc46766ccd981adaf5 Mon Sep 17 00:00:00 2001 From: Hobbabobba Date: Fri, 7 Oct 2022 21:19:55 +0200 Subject: [PATCH 2/8] example_configs: add hedgedoc Co-authored-by: nitnelave --- README.md | 1 + example_configs/hedgedoc.md | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 example_configs/hedgedoc.md diff --git a/README.md b/README.md index 8c27493..628ebd6 100644 --- a/README.md +++ b/README.md @@ -260,6 +260,7 @@ folder for help with: - [Emby](example_configs/emby.md) - [Gitea](example_configs/gitea.md) - [Grafana](example_configs/grafana_ldap_config.toml) + - [Hedgedoc](example_configs/hedgedoc.md) - [Jellyfin](example_configs/jellyfin.md) - [Jitsi Meet](example_configs/jitsi_meet.conf) - [KeyCloak](example_configs/keycloak.md) diff --git a/example_configs/hedgedoc.md b/example_configs/hedgedoc.md new file mode 100644 index 0000000..de36c90 --- /dev/null +++ b/example_configs/hedgedoc.md @@ -0,0 +1,16 @@ +# Configuration for hedgedoc + +[Hedgedoc](https://hedgedoc.org/) is a platform to write and share markdown. + +### Using docker variables + +Any member of the group ```hedgedoc``` can log into hedgedoc. +``` +- CMD_LDAP_URL=ldap://lldap:3890 +- CMD_LDAP_BINDDN=uid=admin,ou=people,dc=example,dc=com +- CMD_LDAP_BINDCREDENTIALS=insert_your_password +- CMD_LDAP_SEARCHBASE=ou=people,dc=example,dc=com +- CMD_LDAP_SEARCHFILTER=(&(memberOf=cn=hedgedoc,ou=groups,dc=example,dc=com)(uid={{username}})) +- CMD_LDAP_USERIDFIELD=uid +``` +Replace `dc=example,dc=com` with your LLDAP configured domain for all occurances From 4ffa565e51ce54c0c3933050d0ccb451f468c781 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 Oct 2022 06:33:30 +0200 Subject: [PATCH 3/8] build(deps): bump actions/checkout from 2 to 3.1.0 (#314) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.1.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3.1.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: nitnelave --- .github/workflows/docker-build-static.yml | 12 ++++++------ .github/workflows/rust.yml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-build-static.yml b/.github/workflows/docker-build-static.yml index 22c6908..0cb13f9 100644 --- a/.github/workflows/docker-build-static.yml +++ b/.github/workflows/docker-build-static.yml @@ -80,7 +80,7 @@ jobs: restore-keys: | lldap-ui- - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: install rollup nodejs run: npm install -g rollup - name: install wasm-pack with cargo @@ -119,7 +119,7 @@ jobs: - name: smoke test run: rustc --version - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - uses: actions/cache@v3 with: path: | @@ -164,11 +164,11 @@ jobs: CARGO_HOME: ${GITHUB_WORKSPACE}/.cargo steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: smoke test run: rustc --version - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - uses: actions/cache@v3 with: path: | @@ -214,7 +214,7 @@ jobs: CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER: x86_64-linux-musl-gcc steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - uses: actions/cache@v3 with: path: | @@ -262,7 +262,7 @@ jobs: - name: install rsync run: sudo apt update && sudo apt install -y rsync - name: fetch repo - uses: actions/checkout@v2 + uses: actions/checkout@v3.1.0 - name: Download armhf lldap artifacts uses: actions/download-artifact@v3 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 71a7949..bf4ebb1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v3.1.0 - uses: Swatinem/rust-cache@v1 - name: Build run: cargo build --verbose --workspace @@ -53,7 +53,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v3.1.0 - uses: Swatinem/rust-cache@v1 @@ -70,7 +70,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v3.1.0 - uses: Swatinem/rust-cache@v1 @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v3.1.0 - name: Install Rust run: rustup toolchain install nightly --component llvm-tools-preview && rustup component add llvm-tools-preview --toolchain stable-x86_64-unknown-linux-gnu From 412f4fa644e8118a30748b0397845d0663799bfc Mon Sep 17 00:00:00 2001 From: Hobbabobba Date: Sun, 9 Oct 2022 13:11:26 +0200 Subject: [PATCH 4/8] example_config: add Docuwiki --- README.md | 1 + example_configs/dokuwiki.md | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 example_configs/dokuwiki.md diff --git a/README.md b/README.md index 628ebd6..1797ae2 100644 --- a/README.md +++ b/README.md @@ -256,6 +256,7 @@ folder for help with: - [Authelia](example_configs/authelia_config.yml) - [Bookstack](example_configs/bookstack.env.example) - [Calibre-Web](example_configs/calibre_web.md) + - [Dokuwiki](example_configs/dokuwiki.md) - [Dolibarr](example_configs/dolibarr.md) - [Emby](example_configs/emby.md) - [Gitea](example_configs/gitea.md) diff --git a/example_configs/dokuwiki.md b/example_configs/dokuwiki.md new file mode 100644 index 0000000..1f54547 --- /dev/null +++ b/example_configs/dokuwiki.md @@ -0,0 +1,25 @@ +# Configuration for dokuwiki + +LDAP configuration is in ```/dokuwiki/conf/local.protected.php```: + +``` + DokuWiki > Authentication. +On the Authentication backend, select ```authldap``` and save the changes. From 32f28d664e154e0569f0fa3bf4b85503530273e0 Mon Sep 17 00:00:00 2001 From: Valentin Tolmer Date: Mon, 10 Oct 2022 17:27:17 +0200 Subject: [PATCH 5/8] Bump to version 0.4.1 --- CHANGELOG.md | 15 +++++++++++++++ app/Cargo.toml | 2 +- migration-tool/Cargo.toml | 2 +- server/Cargo.toml | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0488826..1a42a54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.4.1] - 2022-10-10 + +### Added + + - Added support for STARTTLS for SMTP. + - Added support for user profile pictures, including importing them from OpenLDAP. + - Added support for every config value to be specified in a file. + - Added support for PKCS1 keys. + +### Changed + + - The `dn` attribute is no longer returned as an attribute (it's still part of the response). + - Empty attributes are no longer returned. + - The docker image now uses the locally-downloaded assets. + ## [0.4.0] - 2022-07-08 ### Breaking diff --git a/app/Cargo.toml b/app/Cargo.toml index 5ff4197..3867134 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lldap_app" -version = "0.4.0" +version = "0.4.1" authors = ["Valentin Tolmer "] edition = "2021" diff --git a/migration-tool/Cargo.toml b/migration-tool/Cargo.toml index 852002f..8047b9e 100644 --- a/migration-tool/Cargo.toml +++ b/migration-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "migration-tool" -version = "0.3.0-alpha.1" +version = "0.4.1" edition = "2021" authors = ["Valentin Tolmer "] diff --git a/server/Cargo.toml b/server/Cargo.toml index 9fb2c77..7a4059f 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Valentin Tolmer "] edition = "2021" name = "lldap" -version = "0.4.0" +version = "0.4.1" [dependencies] actix = "0.12" From b3f64c6efe44f76488b6c15af4c445db6854a2bb Mon Sep 17 00:00:00 2001 From: Valentin Tolmer Date: Mon, 10 Oct 2022 17:47:53 +0200 Subject: [PATCH 6/8] Bump version to 0.4.2-alpha --- app/Cargo.toml | 2 +- migration-tool/Cargo.toml | 2 +- server/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Cargo.toml b/app/Cargo.toml index 3867134..d41c0a6 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lldap_app" -version = "0.4.1" +version = "0.4.2-alpha" authors = ["Valentin Tolmer "] edition = "2021" diff --git a/migration-tool/Cargo.toml b/migration-tool/Cargo.toml index 8047b9e..019f509 100644 --- a/migration-tool/Cargo.toml +++ b/migration-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "migration-tool" -version = "0.4.1" +version = "0.4.2-alpha" edition = "2021" authors = ["Valentin Tolmer "] diff --git a/server/Cargo.toml b/server/Cargo.toml index 7a4059f..6e8af52 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Valentin Tolmer "] edition = "2021" name = "lldap" -version = "0.4.1" +version = "0.4.2-alpha" [dependencies] actix = "0.12" From a2dfca0e3744917777751b89f9e1b02d1a480da2 Mon Sep 17 00:00:00 2001 From: Floris Date: Tue, 11 Oct 2022 09:31:26 +0200 Subject: [PATCH 7/8] readme: Update to reflect new stable user env settings --- README.md | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 1797ae2..a7fcc4c 100644 --- a/README.md +++ b/README.md @@ -97,8 +97,11 @@ variables `LLDAP_JWT_SECRET_FILE` or `LLDAP_LDAP_USER_PASS_FILE`, and the file contents are loaded into the respective configuration parameters. Note that `_FILE` variables take precedence. -Example for docker compose for `:stable` tag: -* When defined with `user: ##:##` , ensure `/data` directory had permission for the defined user, else `1000:1000` used. +Example for docker compose: +* You can use either the `:latest` tag image or `:stable` as used in this example. +* `:latest` tag image contains recently pushed code or feature tests, in which some instability can be expected. +* If `UID` and `GID` no defined LLDAP will use default `UID` and `GID` number `1000` + ```yaml version: '3' @@ -110,37 +113,6 @@ volumes: services: lldap: image: nitnelave/lldap:stable - # Change this to the user:group you want. - user: "33:33" - ports: - # For LDAP - - "3890:3890" - # For the web front-end - - "17170:17170" - volumes: - - "lldap_data:/data" - # Alternatively, you can mount a local folder - # - "./lldap_data:/data" - environment: - - LLDAP_JWT_SECRET=REPLACE_WITH_RANDOM - - LLDAP_LDAP_USER_PASS=REPLACE_WITH_PASSWORD - - LLDAP_LDAP_BASE_DN=dc=example,dc=com -``` - -Example for docker compose for `:latest` tag: -* `:latest` tag image contain recent pushed codes or feature test, breaks is expected. -* If `UID` and `GID` no defined LLDAP will use default `UID` and `GID` number `1000` - -```yaml -version: '3' - -volumes: - lldap_data: - driver: local - -services: - lldap: - image: nitnelave/lldap:latest ports: # For LDAP - "3890:3890" From 01d4b6e1fc3d2fa73349357836611e4774c49574 Mon Sep 17 00:00:00 2001 From: Valentin Tolmer Date: Wed, 12 Oct 2022 10:51:09 +0200 Subject: [PATCH 8/8] lock: update Cargo.lock --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5f894f5..2f3efda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2100,7 +2100,7 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "lldap" -version = "0.4.0" +version = "0.4.2-alpha" dependencies = [ "actix", "actix-files", @@ -2166,7 +2166,7 @@ dependencies = [ [[package]] name = "lldap_app" -version = "0.4.0" +version = "0.4.2-alpha" dependencies = [ "anyhow", "base64", @@ -2285,7 +2285,7 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "migration-tool" -version = "0.3.0-alpha.1" +version = "0.4.2-alpha" dependencies = [ "anyhow", "base64",