fix: fix issues reported by cpplint

.gitignore

@@ -227,3 +227,5 @@ fabric.properties
 
 # Google C++ test library
 googletest*
+
+config.json

CPPLINT.cfg

@@ -0,0 +1,2 @@
+set noparent
+filter=-legal/copyright,-build/c++11,-build/header_guard

src/include/config.cpp

@@ -22,8 +22,7 @@ void Config::load(const char *path) {
       j.at("oauth").at("username_attribute").get<std::string>();
   qr_error_correction_level =
       j.at("qr").at("error_correction_level").get<int>();
-  if (j.find("ldap") != j.end() and
-      j["ldap"].find("hosts") != j["ldap"].end()) {
+  if (j.find("ldap") != j.end() && j["ldap"].find("hosts") != j["ldap"].end()) {
     for (auto &host : j["ldap"]["hosts"]) {
       ldap_hosts.insert((std::string)host);
     }
@@ -46,7 +45,7 @@ void Config::load(const char *path) {
       }
     }
   }
-  request_mfa = bool(false);
+  request_mfa = false;
   if (j["oauth"].contains("request_mfa")) {
     request_mfa = j.at("oauth").at("request_mfa").get<bool>();
   }

src/include/ldapquery.c

@@ -1,4 +1,4 @@
-#include "ldapquery.h"
+#include "ldapquery.h"  // NOLINT(build/include_subdir)
 
 #include <ldap.h>
 #include <stdio.h>
@@ -29,8 +29,9 @@ int ldap_check_attr(const char *host, const char *basedn, const char *user,
     return LDAPQUERY_ERROR;
   }
 
-  passwd_local = (char *)malloc(strlen(passwd) + 1);
-  strcpy(passwd_local, passwd);
+  passwd_local =
+      (char *)malloc(strlen(passwd) + 1);  // NOLINT(readability/casting)
+  strcpy(passwd_local, passwd);            // NOLINT(runtime/printf)
   cred.bv_val = passwd_local;
   cred.bv_len = strlen(passwd);
   rc = ldap_sasl_bind_s(ld, user, LDAP_SASL_SIMPLE, &cred, NULL, NULL,
@@ -81,4 +82,4 @@ int ldap_check_attr(const char *host, const char *basedn, const char *user,
   ldap_msgfree(res);
   ldap_unbind_ext_s(ld, NULL, NULL);
   return rc;
-}
+}

src/include/ldapquery.h

@@ -9,4 +9,4 @@ int ldap_check_attr(const char *host, const char *basedn, const char *user,
                     const char *passwd, const char *filter, const char *attr,
                     const char *value);
 
-#endif  // PAM_OAUTH2_DEVICE_LDAPQUERY_H
+#endif  // PAM_OAUTH2_DEVICE_LDAPQUERY_H

src/pam_oauth2_device.cpp

@@ -105,7 +105,8 @@ std::string DeviceAuthResponse::get_prompt(const int qr_ecc = 0) {
 
 static size_t WriteCallback(void *contents, size_t size, size_t nmemb,
                             void *userp) {
-  ((std::string *)userp)->append((char *)contents, size * nmemb);
+  ((std::string *)userp)
+      ->append(reinterpret_cast<char *>(contents), size * nmemb);
   return size * nmemb;
 }
 
@@ -128,7 +129,6 @@ void make_authorization_request(const char *client_id,
     params += "&acr_values=https://refeds.org/profile/mfa";
     params +=
         " urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport";
-    ;
   }
   curl_easy_setopt(curl, CURLOPT_URL, device_endpoint);
   curl_easy_setopt(curl, CURLOPT_USERNAME, client_id);
@@ -160,7 +160,7 @@ void make_authorization_request(const char *client_id,
 
 void poll_for_token(const char *client_id, const char *client_secret,
                     const char *token_endpoint, const char *device_code,
-                    std::string &token) {
+                    std::string *token) {
   int timeout = 300, interval = 3;
   CURL *curl;
   CURLcode res;
@@ -201,7 +201,7 @@ void poll_for_token(const char *client_id, const char *client_secret,
     try {
       data = json::parse(readBuffer);
       if (data["error"].empty()) {
-        token = data.at("access_token");
+        token->assign(data.at("access_token"));
         break;
       } else if (data["error"] == "authorization_pending") {
         // Do nothing
@@ -389,7 +389,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
     show_prompt(pamh, config.qr_error_correction_level, &device_auth_response);
     poll_for_token(config.client_id.c_str(), config.client_secret.c_str(),
                    config.token_endpoint.c_str(),
-                   device_auth_response.device_code.c_str(), token);
+                   device_auth_response.device_code.c_str(), &token);
     get_userinfo(config.userinfo_endpoint.c_str(), token.c_str(),
                  config.username_attribute.c_str(), &userinfo);
   } catch (PamError &e) {

src/pam_oauth2_device.hpp

@@ -22,9 +22,9 @@ void make_authorization_request(const char *client_id,
 
 void poll_for_token(const char *client_id, const char *client_secret,
                     const char *token_endpoint, const char *device_code,
-                    std::string &token);
+                    std::string *token);
 
 void get_userinfo(const char *userinfo_endpoint, const char *token,
                   const char *username_attribute, Userinfo *userinfo);
 
-#endif  // PAM_OAUTH2_DEVICE_HPP
+#endif  // PAM_OAUTH2_DEVICE_HPP

test/test_pam_oauth2_device.cpp

@@ -28,7 +28,7 @@ TEST(PamTest, Device) {
 
 TEST(PamTest, Token) {
   std::string token;
-  poll_for_token(CLIENT_ID, CLIENT_SECRET, TOKEN_ENDPOINT, DEVICE_CODE, token);
+  poll_for_token(CLIENT_ID, CLIENT_SECRET, TOKEN_ENDPOINT, DEVICE_CODE, &token);
   EXPECT_EQ(token, ACCESS_TOKEN);
 }