Skip to content
Snippets Groups Projects

rename insecure to --no-tls and add to Makefile

Merged rename insecure to --no-tls and add to Makefile
f-run-insecure into dev
3 unresolved threads
Merged Timm Fitschen requested to merge f-run-insecure into dev
3 unresolved threads

Summary

Server can be startet without TLS (only HTTP, no certificate needed) even when not in debug mode.

Focus

The actual change is only a one-liner in CaosDBServer.java

The Makefile is changed to make it easy to start the server without tls

Test Environment

Test in deploy (https://gitlab.indiscale.com/caosdb/src/caosdb-deploy/-/merge_requests/124) with no_tls set to true/false

Check List for the Author

  • All automated tests pass
  • Reference related Issues
  • Up-to-date CHANGELOG.md
  • Annotations in code (Gitlab comments)
    • Intent of new code
    • Problems with old code
    • Why this implementation?

Check List for the Reviewer

  • I understand the intent of this MR
  • All automated tests pass
  • Up-to-date CHANGELOG.md
  • The test environment setup works and the intended behavior is reproducible in the test environment
  • In-code documentation and comments are up-to-date.
  • Check: Are there spezifications? Are they satisfied?

For further good practices have a look at our review guidelines.

Edited by Henrik tom Wörden

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
src/main/java/org/caosdb/server/CaosDBServer.java
117 117 private static ArrayList<Runnable> postShutdownHooks = new ArrayList<Runnable>();
118 118 private static ArrayList<Runnable> preShutdownHooks = new ArrayList<Runnable>();
119 119 private static boolean START_BACKEND = true;
120 private static boolean INSECURE = false;
120 private static boolean NO_TLS = false;
  • Timm Fitschen
    Timm Fitschen @timm started a thread on the diff
    • src/main/java/org/caosdb/server/CaosDBServer.java
    168 * `caosdb.debug` JVM Property.
    169 169 *
    170 170 * @param args
    171 171 */
    172 172 private static void parseArguments(final String[] args) {
    173 173 for (final String s : args) {
    174 if (s.equals("nobackend")) {
    174 if (s.equals("--no-backend")) {
    175 175 START_BACKEND = false;
    176 } else if (s.equals("insecure")) {
    177 INSECURE = true;
    176 } else if (s.equals("--no-tls")) {
    177 NO_TLS = true;
    178 178 }
    179 179 }
    180 INSECURE = INSECURE && isDebugMode(); // only allow insecure in debug mode
  • Timm Fitschen
    Timm Fitschen @timm started a thread on the diff
    • Makefile
    24 24 #
    25 25
    26 26 CAOSDB_SERVER_VERSION ?= $(shell mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)
    27 CAOSDB_COMMAND_LINE_OPTIONS ?=
  • Timm Fitschen marked the checklist item Annotations in code (Gitlab comments) as completed

    marked the checklist item Annotations in code (Gitlab comments) as completed

  • Timm Fitschen requested review from @henrik

    requested review from @henrik

  • Henrik tom Wörden marked the checklist item I understand the intent of this MR as completed

    marked the checklist item I understand the intent of this MR as completed

  • Henrik tom Wörden marked the checklist item Up-to-date CHANGELOG.md as completed

    marked the checklist item Up-to-date CHANGELOG.md as completed

  • Henrik tom Wörden marked the checklist item The test environment setup works and the intended behavior is as completed

    marked the checklist item The test environment setup works and the intended behavior is as completed

  • Henrik tom Wörden marked the checklist item In-code documentation and comments are up-to-date. as completed

    marked the checklist item In-code documentation and comments are up-to-date. as completed

  • Henrik tom Wörden marked the checklist item Check: Are there spezifications? Are they satisfied? as completed

    marked the checklist item Check: Are there spezifications? Are they satisfied? as completed

  • Henrik tom Wörden merged

    merged

  • Henrik tom Wörden mentioned in commit a35254cc

    mentioned in commit a35254cc

    • Please register or sign in to reply