diff --git a/.gitignore b/.gitignore index 2b4a625324a2696c6ff9d8ecf55254451d57ef9c..c6fdfc4d387f8be1bb3a4f51a73230aabcc9b02b 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,7 @@ __pycache__ # Documentation binaries src/doc/development/api/xml/*.jar + + +# data directories +CaosDBFileSystem diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bd479a63f27e29fd930ae5f087692f1d8d4307f..cbdc98008960ef2fdce6402e404d52469cbead41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## [v0.5.0] - 2021-10-19 + +### Added + * An openAPI specification of the XML api * New server configuration option `SERVER_BIND_ADDRESS`, which is the address to listen to. See [server.conf](conf/core/server.conf). diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 3af219c2748c568d29de9044a1e3bdb077335f6e..6159dcd8f0ed2296e2f3ac992830f03659d1a131 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -1,5 +1,5 @@ -* caosdb-mysqlbackend == 4.1.0 +* caosdb-mysqlbackend == 5.0.0 * Java 11 * Apache Maven >= 3.6.0 * make >= 4.2.0 -- easy-units >= 0.0.1 https://gitlab.com/timm.fitschen/easy-units +* More dependencies are being pulled and installed automatically by Maven. See the complete list of dependencies in the [pom.xml](pom.xml) diff --git a/README_SETUP.md b/README_SETUP.md index 95805257d3ca285abeb4fcb2e3901cba291c57c0..d738ad13768df8878b55808e4519202fc95dbd86 100644 --- a/README_SETUP.md +++ b/README_SETUP.md @@ -59,6 +59,11 @@ installed and the pam user tool must be compiled: - If you want, you can run a test now: `./pam_authentication.sh asdf ghjk` should print `[FAILED]` and return with a non-zero exit code. Unless there is a user `asdf` with password `ghjk` on your system, of course. +- If you want to run the CaosDB server without root privilege, you need to use + the setuid bit for the binary. For example, if the user `caosdb` runs the + server process the permissions of `bin/pam_authentication` should be the + following: + `-rwsr-x--- 1 root caosdb pam_authentication` ##### Troubleshooting #### If `make` fails with `pam_authentication.c:4:31: fatal error: diff --git a/caosdb-webui b/caosdb-webui index c2dc8e9e9e0517ee7fb0d280717211a015906f64..8e5799db53b853b06a51a3bd250daeb9c779eee5 160000 --- a/caosdb-webui +++ b/caosdb-webui @@ -1 +1 @@ -Subproject commit c2dc8e9e9e0517ee7fb0d280717211a015906f64 +Subproject commit 8e5799db53b853b06a51a3bd250daeb9c779eee5 diff --git a/conf/core/server.conf b/conf/core/server.conf index 64ba2f070104ac03c5a59b7556592ead795d1cd9..246be9aa9285e4434803d3a71d18c24412922bf4 100644 --- a/conf/core/server.conf +++ b/conf/core/server.conf @@ -53,6 +53,7 @@ USER_SOURCES_INI_FILE=./conf/ext/usersources.ini NEW_USER_DEFAULT_ACTIVITY=INACTIVE # If set to true, unauthenticated access to the database is possible with an anonymous user. AUTH_OPTIONAL=FALSE +#AUTH_OPTIONAL=TRUE # -------------------------------------------------- # MySQL settings @@ -77,6 +78,8 @@ MYSQL_SCHEMA_VERSION=v5.0 # The context root is a prefix which allows running multiple instances of CaosDB using the same # hostname and port. Must start with "/". CONTEXT_ROOT= +#CONTEXT_ROOT=/caosdb + # Server bind/host address, which is the address to listen to. Set to blank, or # 0.0.0.0 in IPv4, to listen to all. Set to 127.0.0.1 to make it available to # localhost only. @@ -166,7 +169,8 @@ ADMIN_EMAIL= BUGTRACKER_URI= # If set to true MySQL stores transaction benchmarks for all SQL queries. Used for benchmarking and debugging. -TRANSACTION_BENCHMARK_ENABLED=true +TRANSACTION_BENCHMARK_ENABLED=FALSE +#TRANSACTION_BENCHMARK_ENABLED=TRUE # Location of the configuration file for the CaosDB cache. CACHE_CONF_LOC=./conf/core/cache.ccf # Set this option to true to lobally disable caching. Used for debugging. @@ -174,6 +178,7 @@ CACHE_DISABLE=false # The server is allowed to create symlinks to files and folders within this whitelist of directories. INSERT_FILES_IN_DIR_ALLOWED_DIRS= +#INSERT_FILES_IN_DIR_ALLOWED_DIRS=/data/caosdb,/fileserver01/caosdb # Sudo password of the system. # Needed by the drop off box to set file permissions. diff --git a/pom.xml b/pom.xml index 23b60c4aee23c3ab7800974807e16a9bb2b09418..55aaeedb06b23eba2c78e7b6e27189ee5e7a475f 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.caosdb</groupId> <artifactId>caosdb-server</artifactId> - <version>0.5.0-GRPC0.0.20</version> + <version>0.5.1-GRPC0.0.20</version> <packaging>jar</packaging> <name>CaosDB Server</name> <scm> diff --git a/src/doc/conf.py b/src/doc/conf.py index 16e049be56d85a6246ebd58b921dd6a5adcf1938..604797f15d0585f3cc890f2d40e350caa960ed24 100644 --- a/src/doc/conf.py +++ b/src/doc/conf.py @@ -27,7 +27,7 @@ author = 'Daniel Hornung' # The short X.Y version version = '0.5' # The full version, including alpha/beta/rc tags -release = '0.5.0-SNAPSHOT' +release = '0.5.1-SNAPSHOT' # -- General configuration ---------------------------------------------------