create fopen_modsec

Author: kanseiishikawa

bindings/python

@@ -1,4 +1,3 @@
-
 #line 3 "seclang-scanner.cc"
 
 #define  YY_INT_ALIGNED short int
@@ -4953,6 +4952,7 @@ char *yytext;
 #include "src/parser/seclang-parser.hh"
 #include "src/utils/https_client.h"
 #include "src/utils/string.h"
+#include "src/utils/system.h"
 
 using modsecurity::Parser::Driver;
 using modsecurity::Utils::HttpsClient;
@@ -8400,8 +8400,7 @@ YY_RULE_SETUP
         driver.loc.push_back(new yy::location());
         driver.m_filenames.push_back(f);
         driver.loc.back()->begin.filename = driver.loc.back()->end.filename = &(driver.m_filenames.back());
-        yyin = fopen(f.c_str(), "r" );
-        if (!yyin) {
+        if (!modsecurity::utils::fopen_modsec(&yyin, f.c_str(), "r") != 0) {
             BEGIN(INITIAL);
             driver.loc.pop_back();
             driver.error (*driver.loc.back(), "", s + std::string(": Not able to open file. ") + err);
@@ -8433,8 +8432,7 @@ YY_RULE_SETUP
         driver.m_filenames.push_back(f);
         driver.loc.back()->begin.filename = driver.loc.back()->end.filename = &(driver.m_filenames.back());
 
-        yyin = fopen(f.c_str(), "r" );
-        if (!yyin) {
+        if (!modsecurity::utils::fopen_modsec(&yyin, f.c_str(), "r") != 0) {
             BEGIN(INITIAL);
             driver.loc.pop_back();
             driver.error (*driver.loc.back(), "", s + std::string(": Not able to open file. ") + err);

others/libinjection

@@ -1,4 +1,4 @@
-%{ /* -*- C++ -*- */
+/* -*- C++ -*- */
 #include <cerrno>
 #include <climits>
 #include <cstdlib>
@@ -8,6 +8,7 @@
 #include "src/parser/seclang-parser.hh"
 #include "src/utils/https_client.h"
 #include "src/utils/string.h"
+#include "src/utils/system.h"
 
 using modsecurity::Parser::Driver;
 using modsecurity::Utils::HttpsClient;
@@ -1273,8 +1274,7 @@ EQUALS_MINUS                            (?i:=\-)
         driver.loc.push_back(new yy::location());
         driver.m_filenames.push_back(f);
         driver.loc.back()->begin.filename = driver.loc.back()->end.filename = &(driver.m_filenames.back());
-        yyin = fopen(f.c_str(), "r" );
-        if (!yyin) {
+        if (!modsecurity::utils::fopen_modsec(&yyin, f.c_str(), "r")) {
             BEGIN(INITIAL);
             driver.loc.pop_back();
             driver.error (*driver.loc.back(), "", s + std::string(": Not able to open file. ") + err);
@@ -1303,8 +1303,7 @@ EQUALS_MINUS                            (?i:=\-)
         driver.m_filenames.push_back(f);
         driver.loc.back()->begin.filename = driver.loc.back()->end.filename = &(driver.m_filenames.back());
 
-        yyin = fopen(f.c_str(), "r" );
-        if (!yyin) {
+        if (!modsecurity::utils::fopen_modsec(&yyin, f.c_str(), "r") != 0) {
             BEGIN(INITIAL);
             driver.loc.pop_back();
             driver.error (*driver.loc.back(), "", s + std::string(": Not able to open file. ") + err);

others/mbedtls

@@ -14,6 +14,7 @@
  */
 
 #include "src/utils/shared_files.h"
+#include "src/utils/system.h"
 
 #include <fcntl.h>
 #ifdef WIN32
@@ -27,8 +28,8 @@ namespace utils {
 
 SharedFiles::handlers_map::iterator SharedFiles::add_new_handler(
     const std::string &fileName, std::string *error) {
-    FILE *fp = fopen(fileName.c_str(), "a");
-    if (fp == 0) {
+    FILE *fp;
+    if (!fopen_modsec(&fp, fileName.c_str(), "a")) {
         error->assign("Failed to open file: " + fileName);
         return m_handlers.end();
     }

src/parser/seclang-scanner.cc

@@ -13,6 +13,7 @@
  *
  */
 
+#include <bits/types/FILE.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -205,8 +206,8 @@ bool createDir(const std::string& dir, int mode, std::string *error) {
 
 bool isFile(const std::string& f) {
     struct stat fileInfo;
-    FILE *fp = fopen(f.c_str(), "r");
-    if (fp == NULL) {
+    FILE *fp;
+    if (!fopen_modsec(&fp, f.c_str(), "r")) {
         return false;
     }
     fstat(fileno(fp), &fileInfo);
@@ -219,6 +220,15 @@ bool isFile(const std::string& f) {
     return true;
 }
 
-
+bool fopen_modsec(FILE **v_fp, const char *filename, const char *mode) {
+    if (v_fp == NULL || filename == NULL || mode == NULL) {
+        return false;
+    }
+    *v_fp = fopen(filename, mode);
+    if (*v_fp == NULL) {
+        return false;
+    }
+    return true;
+}
 }  // namespace utils
 }  // namespace modsecurity

src/parser/seclang-scanner.ll

@@ -33,6 +33,7 @@ std::string get_path(const std::string& file);
 std::list<std::string> expandEnv(const std::string& var, int flags);
 bool createDir(const std::string& dir, int mode, std::string *error);
 bool isFile(const std::string& f);
+bool fopen_modsec(FILE **v_fp, const char *filename, const char *mode);
 
 }  // namespace utils
 }  // namespace modsecurity