Changeset 1599:b3d6c00c911e

Timestamp:

03/02/10 06:28:22 (5 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

support using files for sql injections for pre-sql, post-sql, and post-block-sql

File:

• apps/las2oci.cpp (modified) (8 diffs)

apps/las2oci.cpp

@@ -83 +83 @@
 
 
-std::istream* OpenInput(std::string filename) 
-{
-    std::ios::openmode const mode = std::ios::in | std::ios::binary;
+std::istream* OpenInput(std::string filename, bool bEnd) 
+{
+    std::ios::openmode mode = std::ios::in | std::ios::binary;
+    if (bEnd == true) {
+        mode = mode | std::ios::ate;
+    }
     std::istream* istrm;
     if (compare_no_case(filename.c_str(),"STDIN",5) == 0)
@@ -103 +106 @@
     }
     return istrm;
+}
+
+std::string ReadSQLData(char* filename)
+{
+    std::istream* infile = OpenInput(filename, true);
+    ifstream::pos_type size;
+    char* data;
+    if (infile->good()){
+        size = infile->tellg();
+        data = new char [size];
+        infile->seekg (0, ios::beg);
+        infile->read (data, size);
+        // infile->close();
+
+        std::string output = std::string(data);
+        delete[] data;
+        delete infile;
+        return output;
+    } 
+    else 
+    {   
+        delete infile;
+        return std::string("");
+    }
 }
 
@@ -1349 +1376 @@
         {
             i++;
-            pre_sql = std::string(argv[i]);
+            try {
+                pre_sql = ReadSQLData(argv[i]);
+            } catch (std::runtime_error const& e) {
+                pre_sql = std::string(argv[i]);
+            }
         }
         else if (   strcmp(argv[i],"--post-sql") == 0  ||
@@ -1356 +1387 @@
         {
             i++;
-            post_sql = std::string(argv[i]);
+            try {
+                post_sql = ReadSQLData(argv[i]);
+            } catch (std::runtime_error const& e) {
+                post_sql = std::string(argv[i]);
+            }
         }
         else if (   strcmp(argv[i],"--pre-block-sql") == 0  ||
@@ -1363 +1398 @@
         {
             i++;
-            pre_block_sql = std::string(argv[i]);
+            try {
+                pre_block_sql = ReadSQLData(argv[i]);
+            } catch (std::runtime_error const& e) {
+                pre_block_sql = std::string(argv[i]);
+            }
         }
         else if (   strcmp(argv[i],"--aux-columns") == 0  ||
@@ -1519 +1558 @@
     std::istream* istrm;
     try {
-            istrm = OpenInput(input);
+            istrm = OpenInput(input, false);
     } catch (std::exception const& e)
     {
@@ -1580 +1619 @@
         os << input << ".kdx" ;
         
-        std::istream* kdx = OpenInput(os.str());
+        std::istream* kdx = OpenInput(os.str(), false);
         query = new LASQuery(*kdx);
     }
@@ -1589 +1628 @@
     
     std::istream* istrm2;
-    istrm2 = OpenInput(input);
+    istrm2 = OpenInput(input, false);
     LASReader* reader2 = new LASReader(*istrm2);