From 79c7b49021ca133fd0b52ba07f9e4f8c998052f2 Mon Sep 17 00:00:00 2001
From: zachmann <gabriel.zachmann@kit.edu>
Date: Tue, 27 Aug 2024 12:45:23 +0200
Subject: [PATCH] add `--bearer` and `--auth-header` options to `oidc-token`

---
 CHANGELOG.md                        |  1 +
 src/oidc-token/oidc-token.c         |  8 +++++++-
 src/oidc-token/oidc-token_options.c | 15 +++++++++++++++
 src/oidc-token/oidc-token_options.h |  2 ++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ba3e744..f427a51b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 
 - Added possibility to add custom request parameters to requests done by the agent. This is done through
   a `custom_parameters.config` file placed in the agent dir or `/etc/oidc-agent`
+- Added the `--bearer` and `--auth-header` options to `oidc-token`. These can be used to ease api calls.
 
 ### Change / Enhancement / Bugfix
 
diff --git a/src/oidc-token/oidc-token.c b/src/oidc-token/oidc-token.c
index eae414af..159c401f 100644
--- a/src/oidc-token/oidc-token.c
+++ b/src/oidc-token/oidc-token.c
@@ -76,7 +76,13 @@ int main(int argc, char** argv) {
   } else if ((arguments.expiration_env.useIt + arguments.token_env.useIt +
               arguments.issuer_env.useIt) ==
              0) {  // none of these options specified
-    printf("%s\n", res.token);
+    if (arguments.bearer) {
+      printf("Bearer %s\n", res.token);
+    } else if (arguments.auth_header) {
+      printf("Authorization: Bearer %s", res.token);
+    } else {
+      printf("%s\n", res.token);
+    }
   } else {  // only one option specified
     if (arguments.issuer_env.useIt) {
       if (arguments.issuer_env.str == NULL) {
diff --git a/src/oidc-token/oidc-token_options.c b/src/oidc-token/oidc-token_options.c
index cfd2c4a8..31e6c519 100644
--- a/src/oidc-token/oidc-token_options.c
+++ b/src/oidc-token/oidc-token_options.c
@@ -7,6 +7,8 @@
 #define OPT_NAME 2
 #define OPT_AUDIENCE 3
 #define OPT_IDTOKEN 4
+#define OPT_BEARER 5
+#define OPT_AUTHHEADER 6
 
 static struct argp_option options[] = {
     {0, 0, 0, 0, "General:", 1},
@@ -48,6 +50,15 @@ static struct argp_option options[] = {
      1},
     {"force-new", 'f', 0, 0,
      "Forces that a new access token is issued and returned.", 1},
+    {"bearer", OPT_BEARER, 0, 0,
+     "Returns the token in the bearer format that is suitable as the value"
+     " for an http authorization header",
+     1},
+    {"auth-header", OPT_AUTHHEADER, 0, 0,
+     "Returns the token included in a http authorization header for usage "
+     "with e.g. curl or httpie.",
+     1},
+    {"auth", OPT_AUTHHEADER, 0, OPTION_ALIAS, NULL, 1},
 
     {0, 0, 0, 0, "Advanced:", 2},
     {"scope", 's', "SCOPE", 0,
@@ -107,6 +118,8 @@ static error_t parse_opt(int key, char* arg, struct argp_state* state) {
     case OPT_IDTOKEN: arguments->idtoken = 1; break;
     case OPT_NAME: arguments->application_name = arg; break;
     case OPT_AUDIENCE: arguments->audience = arg; break;
+    case OPT_BEARER: arguments->bearer = 1; break;
+    case OPT_AUTHHEADER: arguments->auth_header = 1; break;
     case 'i':
       arguments->issuer_env.str   = arg;
       arguments->issuer_env.useIt = 1;
@@ -174,4 +187,6 @@ void initArguments(struct arguments* arguments) {
   arguments->printAll             = 0;
   arguments->idtoken              = 0;
   arguments->forceNewToken        = 0;
+  arguments->bearer               = 0;
+  arguments->auth_header          = 0;
 }
diff --git a/src/oidc-token/oidc-token_options.h b/src/oidc-token/oidc-token_options.h
index b000fd14..7b02b8fb 100644
--- a/src/oidc-token/oidc-token_options.h
+++ b/src/oidc-token/oidc-token_options.h
@@ -31,6 +31,8 @@ struct arguments {
   unsigned char printAll;
   unsigned char idtoken;
   unsigned char forceNewToken;
+  unsigned char bearer;
+  unsigned char auth_header;
 
   time_t min_valid_period;
 };