Change: Always enable JWT in authenticate request

We want to get a JWT for every authenticate response. JWT will be
mandatory now.

Author: bjoernricks

doc/gsad.html

@@ -117,14 +117,6 @@ <h2>Options</h2>
 
 
 
-
-          <p><b>--jwt-requested</b></p>
-
-          <p>Enable JWT-based mode using the token returned in the login response.</p>
-
-
-
-
           <p><b>-?, --help</b></p>
 
           <p>Show help.</p>

src/gsad.c

@@ -1948,8 +1948,6 @@ main (int argc, char **argv)
                                   gsad_args_get_pid_filename (gsad_args));
   gsad_settings_set_api_only (gsad_global_settings,
                               gsad_args_is_api_only_enabled (gsad_args));
-  gsad_settings_set_jwt_requested (gsad_global_settings,
-                                   gsad_args_is_jwt_requested (gsad_args));
 
   gsad_settings_set_client_watch_interval (
     gsad_global_settings, gsad_args_get_client_watch_interval (gsad_args));

src/gsad_args.c

@@ -1062,16 +1062,3 @@ gsad_args_is_api_only_enabled (const gsad_args_t *args)
 {
   return args->api_only;
 }
-
-/**
- * @brief Check if JWT requested from the login response.
- *
- * @param[in] args The parsed command-line arguments.
- *
- * @return TRUE if JWT requested mode should be enabled, FALSE otherwise.
- */
-gboolean
-gsad_args_is_jwt_requested (const gsad_args_t *args)
-{
-  return args->jwt_requested;
-}

src/gsad_args.h

@@ -138,9 +138,6 @@ gsad_args_is_chroot_enabled (const gsad_args_t *);
 gboolean
 gsad_args_is_api_only_enabled (const gsad_args_t *);
 
-gboolean
-gsad_args_is_jwt_requested (const gsad_args_t *);
-
 int
 gsad_args_validate_session_timeout (const gsad_args_t *);
 

src/gsad_args_tests.c

@@ -1708,26 +1708,6 @@ Ensure (gsad_args, should_free_gsad_args)
   gsad_args_free (args);
 }
 
-Ensure (gsad_args, should_parse_jwt_requested)
-{
-  gsad_args_t *args = gsad_args_new ();
-  char *argv[] = {"gsad", "--jwt-requested"};
-  gsad_args_parse (2, argv, args);
-
-  assert_that (gsad_args_is_jwt_requested (args), is_true);
-  gsad_args_free (args);
-}
-
-Ensure (gsad_args, should_parse_jwt_requested_default)
-{
-  gsad_args_t *args = gsad_args_new ();
-  char *argv[] = {"gsad"};
-  gsad_args_parse (1, argv, args);
-
-  assert_that (gsad_args_is_jwt_requested (args), is_false);
-  gsad_args_free (args);
-}
-
 int
 main (int argc, char **argv)
 {
@@ -1896,8 +1876,6 @@ main (int argc, char **argv)
   add_test_with_context (suite, gsad_args, should_get_dh_params_filename);
   add_test_with_context (suite, gsad_args, should_get_gnutls_priorities);
   add_test_with_context (suite, gsad_args, should_get_drop_privileges);
-  add_test_with_context (suite, gsad_args, should_parse_jwt_requested);
-  add_test_with_context (suite, gsad_args, should_parse_jwt_requested_default);
 
   add_test_with_context (suite, gsad_args, should_free_gsad_args);
 

src/gsad_gmp.c

@@ -20521,17 +20521,13 @@ authenticate_gmp (const gchar *username, const gchar *password, gchar **role,
       return 1;
     }
 
-  gsad_settings_t *gsad_global_settings = gsad_settings_get_global_settings ();
-
   auth_opts = gmp_authenticate_info_opts_defaults;
   auth_opts.username = username;
   auth_opts.password = password;
   auth_opts.role = role;
   auth_opts.timezone = timezone;
   auth_opts.pw_warning = pw_warning;
-  auth_opts.jwt_requested =
-    gsad_settings_is_jwt_requested (gsad_global_settings);
-  auth_opts.jwt = jwt;
+  auth_opts.jwt_requested = TRUE;
 
   auth = gmp_authenticate_info_ext_c (&connection, auth_opts);
   if (auth == 0)

src/gsad_settings.c

@@ -44,7 +44,6 @@ struct gsad_settings
   int session_timeout;
   int unix_socket;
   int user_session_limit;
-  int jwt_requested;
 };
 
 static gsad_settings_t *settings = NULL;
@@ -90,7 +89,6 @@ gsad_settings_new ()
   settings->session_timeout = DEFAULT_SESSION_TIMEOUT;
   settings->unix_socket = 0;
   settings->user_session_limit = DEFAULT_USER_SESSION_LIMIT;
-  settings->jwt_requested = 0;
   return settings;
 }
 
@@ -755,29 +753,3 @@ gsad_settings_is_api_only_enabled (const gsad_settings_t *settings)
 {
   return settings->api_only;
 }
-
-/**
- * @brief Set whether a JWT token should be requested during authentication.
- *
- * @param[in]  settings       The settings instance to modify.
- * @param[in]  jwt_required   Whether a JWT token should be requested.
- */
-void
-gsad_settings_set_jwt_requested (gsad_settings_t *settings,
-                                 gboolean jwt_required)
-{
-  settings->jwt_requested = jwt_required ? 1 : 0;
-}
-
-/**
- * @brief Check whether a JWT token should be requested during authentication.
- *
- * @param[in]  settings  The settings instance to query.
- *
- * @return 1 if requesting a JWT token is enabled, 0 otherwise.
- */
-int
-gsad_settings_is_jwt_requested (const gsad_settings_t *settings)
-{
-  return settings->jwt_requested;
-}

src/gsad_settings.h

@@ -175,10 +175,4 @@ gsad_settings_set_api_only (gsad_settings_t *, gboolean);
 gboolean
 gsad_settings_is_api_only_enabled (const gsad_settings_t *);
 
-void
-gsad_settings_set_jwt_requested (gsad_settings_t *, gboolean);
-
-int
-gsad_settings_is_jwt_requested (const gsad_settings_t *);
-
 #endif /* _GSAD_SETTINGS_H */

src/gsad_settings_tests.c

@@ -45,7 +45,6 @@ Ensure (gsad_settings, should_use_defaults)
   assert_that (gsad_settings_get_client_watch_interval (settings),
                is_equal_to (DEFAULT_CLIENT_WATCH_INTERVAL));
   assert_that (gsad_settings_get_log_config_filename (settings), is_null);
-  assert_that (gsad_settings_is_jwt_requested (settings), is_equal_to (0));
 
   gsad_settings_free (settings);
 }
@@ -404,21 +403,6 @@ Ensure (gsad_settings, should_set_api_only)
   gsad_settings_free (settings);
 }
 
-Ensure (gsad_settings, should_set_jwt_requested)
-{
-  gsad_settings_t *settings = gsad_settings_new ();
-
-  assert_that (gsad_settings_is_jwt_requested (settings), is_equal_to (0));
-
-  gsad_settings_set_jwt_requested (settings, TRUE);
-  assert_that (gsad_settings_is_jwt_requested (settings), is_equal_to (1));
-
-  gsad_settings_set_jwt_requested (settings, FALSE);
-  assert_that (gsad_settings_is_api_only_enabled (settings), is_equal_to (0));
-
-  gsad_settings_free (settings);
-}
-
 int
 main (int argc, char **argv)
 {
@@ -453,7 +437,6 @@ main (int argc, char **argv)
   add_test_with_context (suite, gsad_settings, should_set_log_config_filename);
   add_test_with_context (suite, gsad_settings, should_set_pid_filename);
   add_test_with_context (suite, gsad_settings, should_set_api_only);
-  add_test_with_context (suite, gsad_settings, should_set_jwt_requested);
 
   int ret = run_test_suite (suite, create_text_reporter ());