[irods#8045] Use std::tolower() with std::transform() correctly.

korydraughn · Dec 6, 2024 · 5878fb0 · 5878fb0
1 parent 64b997d
commit 5878fb0
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 52 deletions.
diff --git a/lib/core/include/irods/authentication_plugin_framework.hpp b/lib/core/include/irods/authentication_plugin_framework.hpp
@@ -16,6 +16,7 @@
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>
 
+#include <cctype>
 #include <functional>
 #include <memory>
 #include <string>
@@ -117,7 +118,8 @@ namespace irods::experimental::auth
         using plugin_type = authentication_base;
 
         std::string scheme = _scheme;
-        std::transform(scheme.begin(), scheme.end(), scheme.begin(), ::tolower);
+        std::transform(
+            scheme.begin(), scheme.end(), scheme.begin(), [](unsigned char _ch) { return std::tolower(_ch); });
 
         const std::string name = fmt::format("irods_auth_plugin-{}_{}", scheme, _type);
 

diff --git a/lib/core/include/irods/experimental_plugin_framework.hpp b/lib/core/include/irods/experimental_plugin_framework.hpp
@@ -15,6 +15,7 @@
 
 // =-=-=-=-=-=-=-
 // stl includes
+#include <cctype>
 #include <sstream>
 #include <string>
 #include <iostream>
@@ -145,10 +146,8 @@ namespace irods::experimental::api {
         static auto resolve_api_plugin(const std::string& operation, const std::string& type)
         {
             std::string lower{operation};
-            std::transform(lower.begin(),
-                           lower.end(),
-                           lower.begin(),
-                           ::tolower );
+            std::transform(
+                lower.begin(), lower.end(), lower.begin(), [](unsigned char _ch) { return std::tolower(_ch); });
 
             base* plugin{};
             auto err = irods::load_plugin<base>(

diff --git a/lib/core/include/irods/irods_query.hpp b/lib/core/include/irods/irods_query.hpp
@@ -16,6 +16,7 @@
 #include <fmt/format.h>
 
 #include <algorithm>
+#include <cctype>
 #include <string>
 #include <vector>
 
@@ -45,10 +46,7 @@ namespace irods
 
             std::string lowered{_str};
             std::transform(
-                lowered.begin(),
-                lowered.end(),
-                lowered.begin(),
-                ::tolower);
+                lowered.begin(), lowered.end(), lowered.begin(), [](unsigned char _ch) { return std::tolower(_ch); });
 
             if(GEN_STR == lowered) {
                 return GENERAL;

diff --git a/lib/core/src/clientLogin.cpp b/lib/core/src/clientLogin.cpp
@@ -25,6 +25,7 @@
 
 #include <fmt/format.h>
 
+#include <cctype>
 #include <cerrno>
 #include <cstdint>
 #include <cstring>
@@ -344,7 +345,9 @@ int clientLogin(rcComm_t* _comm, const char* _context, const char* _scheme_overr
             // =-=-=-=-=-=-=-
             // ensure scheme is lower case for comparison
             std::string lower_scheme = auth_scheme;
-            std::transform( auth_scheme.begin(), auth_scheme.end(), auth_scheme.begin(), ::tolower );
+            std::transform(auth_scheme.begin(), auth_scheme.end(), auth_scheme.begin(), [](unsigned char _ch) {
+                return std::tolower(_ch);
+            });
 
             // =-=-=-=-=-=-=-
             // filter out the pam auth as it is an extra special

diff --git a/lib/core/src/irods_buffer_encryption.cpp b/lib/core/src/irods_buffer_encryption.cpp
@@ -9,6 +9,7 @@
 #include <openssl/aes.h>
 #include <openssl/md5.h>
 
+#include <cctype>
 #include <iostream>
 #include <sstream>
 #include <iomanip>
@@ -62,12 +63,9 @@ namespace irods {
         salt_size_( _salt_sz ),
         num_hash_rounds_( _num_rnds ),
         algorithm_( _algo ) {
-
-        std::transform(
-            algorithm_.begin(),
-            algorithm_.end(),
-            algorithm_.begin(),
-            ::tolower );
+        std::transform(algorithm_.begin(), algorithm_.end(), algorithm_.begin(), [](unsigned char _ch) {
+            return std::tolower(_ch);
+        });
 
         // =-=-=-=-=-=-=-
         // select some sane defaults

diff --git a/lib/hasher/src/checksum.cpp b/lib/hasher/src/checksum.cpp
@@ -9,6 +9,7 @@
 #include "irods/rodsKeyWdDef.h"
 #include "irods/rcMisc.h"
 
+#include <cctype>
 #include <cstdio>
 #include <ctime>
 #include <cstring>
@@ -55,11 +56,9 @@ int chksumLocFile(
         env_policy = env.rodsMatchHashPolicy;
         // =-=-=-=-=-=-=-
         // hash scheme keywords are all lowercase
-        std::transform(
-            env_scheme.begin(),
-            env_scheme.end(),
-            env_scheme.begin(),
-            ::tolower );
+        std::transform(env_scheme.begin(), env_scheme.end(), env_scheme.begin(), [](unsigned char _ch) {
+            return std::tolower(_ch);
+        });
     }
 
     // =-=-=-=-=-=-=-
@@ -71,11 +70,9 @@ int chksumLocFile(
         hash_scheme = _hash_scheme;
         // =-=-=-=-=-=-=-
         // hash scheme keywords are all lowercase
-        std::transform(
-            hash_scheme.begin(),
-            hash_scheme.end(),
-            hash_scheme.begin(),
-            ::tolower );
+        std::transform(hash_scheme.begin(), hash_scheme.end(), hash_scheme.begin(), [](unsigned char _ch) {
+            return std::tolower(_ch);
+        });
     }
     else {
         hash_scheme = env_scheme;
@@ -84,17 +81,11 @@ int chksumLocFile(
 
     // =-=-=-=-=-=-=-
     // hash scheme keywords are all lowercase
+    std::transform(hash_scheme.begin(), hash_scheme.end(), hash_scheme.begin(), [](unsigned char _ch) {
+        return std::tolower(_ch);
+    });
     std::transform(
-        hash_scheme.begin(),
-        hash_scheme.end(),
-        hash_scheme.begin(),
-        ::tolower );
-    std::transform(
-        env_scheme.begin(),
-        env_scheme.end(),
-        env_scheme.begin(),
-        ::tolower );
-
+        env_scheme.begin(), env_scheme.end(), env_scheme.begin(), [](unsigned char _ch) { return std::tolower(_ch); });
 
     // =-=-=-=-=-=-=-
     // verify checksum scheme against configuration

diff --git a/plugins/database/src/db_plugin.cpp b/plugins/database/src/db_plugin.cpp
@@ -2023,11 +2023,7 @@ irods::error db_debug_op(
     // =-=-=-=-=-=-=-
     // run tolower on mode
     std::string mode( _mode );
-    std::transform(
-        mode.begin(),
-        mode.end(),
-        mode.begin(),
-        ::tolower );
+    std::transform(mode.begin(), mode.end(), mode.begin(), [](unsigned char _ch) { return std::tolower(_ch); });
 
     // =-=-=-=-=-=-=-
     // if mode contains 'sql' then turn SQL logging on

diff --git a/server/api/src/rsFileChksum.cpp b/server/api/src/rsFileChksum.cpp
@@ -16,6 +16,7 @@
 #include <fmt/format.h>
 
 #include <algorithm>
+#include <cctype>
 #include <climits>
 #include <string>
 #include <string_view>
@@ -128,11 +129,9 @@ int fileChksum(rsComm_t* rsComm,
     } catch ( const irods::exception& ) {}
 
     // make sure the read parameter is lowercased
-    std::transform(
-        hash_scheme.begin(),
-        hash_scheme.end(),
-        hash_scheme.begin(),
-        ::tolower );
+    std::transform(hash_scheme.begin(), hash_scheme.end(), hash_scheme.begin(), [](unsigned char _ch) {
+        return std::tolower(_ch);
+    });
 
     std::string hash_policy;
     try {
@@ -302,7 +301,9 @@ int file_checksum(RsComm* _comm,
     catch (const irods::exception&) {}
 
     // Make sure the read parameter is lowercased.
-    std::transform(hash_scheme.begin(), hash_scheme.end(), hash_scheme.begin(), ::tolower);
+    std::transform(hash_scheme.begin(), hash_scheme.end(), hash_scheme.begin(), [](unsigned char _ch) {
+        return std::tolower(_ch);
+    });
 
     std::string_view hash_policy;
     try {

diff --git a/server/icat/src/icatHighLevelRoutines.cpp b/server/icat/src/icatHighLevelRoutines.cpp
@@ -25,6 +25,7 @@
 
 // =-=-=-=-=-=-=-
 // stl includes
+#include <cctype> // For std::tolower
 #include <string>
 #include <iostream>
 #include <sstream>
@@ -50,11 +51,7 @@ int chlDebug(
     // =-=-=-=-=-=-=-
     // run tolower on mode
     std::string mode( _mode );
-    std::transform(
-        mode.begin(),
-        mode.end(),
-        mode.begin(),
-        ::tolower );
+    std::transform(mode.begin(), mode.end(), mode.begin(), [](unsigned char _ch) { return std::tolower(_ch); });
 
     // =-=-=-=-=-=-=-
     // if mode contains 'sql' then turn SQL logging on