File: hydra_mongo-c-driver2.diff

package info (click to toggle)
hydra 9.6-3
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 3,856 kB
  • sloc: ansic: 22,258; sh: 2,530; makefile: 140
file content (364 lines) | stat: -rw-r--r-- 12,024 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
Description: Support building w/ mongo-c-driver >= 2.0
Forwarded: yes
Author: Roberto C. Sanchez <roberto@debian.org>
Last-Update: 2025-10-28
---
 configure       |  207 +++++++++++++++++++++++++++++++++++++++++++-------------
 hydra-mongodb.c |    5 +
 hydra.c         |    8 +-
 3 files changed, 170 insertions(+), 50 deletions(-)

--- a/configure
+++ b/configure
@@ -53,6 +53,10 @@
 MYSQL_IPATH=""
 MCACHED_PATH=""
 MCACHED_IPATH=""
+MONGODB2_PATH=""
+MONGODB2_IPATH=""
+BSON2_PATH=""
+BSON2_IPATH=""
 MONGODB_PATH=""
 MONGODB_IPATH=""
 BSON_PATH=""
@@ -1191,96 +1195,192 @@
     fi
 fi

-echo "Checking for Mongodb (libmongoc-1.0/mongoc.h/libbson-1.0/bson.h) ..."
+echo "Checking for Mongodb2 (mongoc-2.x.x/mongoc/mongoc.h/bson-2.x.x/bson/bson.h) ..."

   for i in $LIBDIRS ; do
-    if [ "X" = "X$MONGODB_PATH" ]; then
-        if [ -f "$i/libmongoc-1.0.so" -o -f "$i/libmongoc-1.0.dylib" -o -f "$i/libmongoc-1.0.a" ]; then
-            MONGODB_PATH="$i"
+    if [ "X" = "X$MONGODB2_PATH" ]; then
+        if [ -f "$i/libmongoc2.so" -o -f "$i/libmongoc2.dylib" -o -f "$i/libmongoc2.a" ]; then
+            MONGODB2_PATH="$i"
         fi
     fi
-    if [ "X" = "X$MONGODB_PATH" ]; then
-        TMP_LIB=`/bin/ls $i/libmongoc-*.so* 2> /dev/null | grep mongoc`
+    if [ "X" = "X$MONGODB2_PATH" ]; then
+        TMP_LIB=`/bin/ls $i/libmongoc2.so* 2> /dev/null | grep mongoc`
         if [ -n "$TMP_LIB" ]; then
-          MONGODB_PATH="$i"
+          MONGODB2_PATH="$i"
         fi
     fi
-    if [ "X" = "X$MONGODB_PATH" ]; then
-        TMP_LIB=`/bin/ls $i/libmongoc.dll* 2> /dev/null | grep mongoc`
+    if [ "X" = "X$MONGODB2_PATH" ]; then
+        TMP_LIB=`/bin/ls $i/libmongoc2.dll* 2> /dev/null | grep mongoc`
         if [ -n "$TMP_LIB" ]; then
-          MONGODB_PATH="$i"
+          MONGODB2_PATH="$i"
         fi
     fi
   done

-  MONGODB_IPATH=
+  MONGODB2_IPATH=
   for i in $INCDIRS ; do
-    if [ "X" = "X$MONGODB_IPATH" ]; then
+    if [ "X" = "X$MONGODB2_IPATH" ]; then
         if [ -f "$i/mongoc.h" ]; then
-            MONGODB_IPATH="$i"
+            MONGODB2_IPATH="$i"
         fi
-        if [ -f "$i/libmongoc/mongoc.h" ]; then
-            MONGODB_IPATH="$i/libmongoc"
-        fi
-        if [ -f "$i/libmongoc-1.0/mongoc.h" ]; then
-            MONGODB_IPATH="$i/libmongoc-1.0"
+        if [ -f "$i/mongoc/mongoc.h" ]; then
+            MONGODB2_IPATH="$i/libmongoc"
         fi
+        for ii in `ls -1d $i/mongoc-2.*`; do
+            if [ -f "${ii}/mongoc/mongoc.h" ]; then
+                MONGODB2_IPATH="$ii"
+            fi
+        done
     fi
   done

  for i in $LIBDIRS ; do
-    if [ "X" = "X$BSON_PATH" ]; then
-        if [ -f "$i/libbson-1.0.so" -o -f "$i/libbson-1.0.dylib" -o -f "$i/libbson-1.0.a" ]; then
-            BSON_PATH="$i"
+    if [ "X" = "X$BSON2_PATH" ]; then
+        if [ -f "$i/libbson2.so" -o -f "$i/libbson2.dylib" -o -f "$i/libbson2.a" ]; then
+            BSON2_PATH="$i"
         fi
     fi
-    if [ "X" = "X$BSON_PATH" ]; then
-        TMP_LIB=`/bin/ls $i/libbson-*.so* 2> /dev/null | grep mongoc`
+    if [ "X" = "X$BSON2_PATH" ]; then
+        TMP_LIB=`/bin/ls $i/libbson2*.so* 2> /dev/null | grep mongoc`
         if [ -n "$TMP_LIB" ]; then
-          BSON_PATH="$i"
+          BSON2_PATH="$i"
         fi
     fi
-    if [ "X" = "X$BSON_PATH" ]; then
-        TMP_LIB=`/bin/ls $i/libbson.dll* 2> /dev/null | grep mongoc`
+    if [ "X" = "X$BSON2_PATH" ]; then
+        TMP_LIB=`/bin/ls $i/libbson2.dll* 2> /dev/null | grep mongoc`
         if [ -n "$TMP_LIB" ]; then
-          BSON_PATH="$i"
+          BSON2_PATH="$i"
         fi
     fi
   done

-  BSON_IPATH=
+  BSON2_IPATH=
   for i in $INCDIRS ; do
-    if [ "X" = "X$BSON_IPATH" ]; then
+    if [ "X" = "X$BSON2_IPATH" ]; then
         if [ -f "$i/bson.h" ]; then
-            BSON_IPATH="$i"
+            BSON2_IPATH="$i"
         fi
         if [ -f "$i/libbson/bson.h" ]; then
-            BSON_IPATH="$i/libbson"
-        fi
-        if [ -f "$i/libbson-1.0/bson.h" ]; then
-            BSON_IPATH="$i/libbson-1.0"
+            BSON2_IPATH="$i/libbson"
         fi
+        for ii in `ls -1d $i/bson-2.*`; do
+            if [ -f "${ii}/bson/bson.h" ]; then
+                BSON2_IPATH="$ii"
+            fi
+        done
     fi
   done

 if [ "X" != "X$DEBUG" ]; then
-   echo DEBUG: MONGODB_PATH=$MONGODB_PATH/libmongoc
-   echo DEBUG: MONGODB_IPATH=$MONGODB_IPATH/libmongoc.h
-   echo DEBUG: BSON_PATH=$BSON_PATH/libbson
-   echo DEBUG: BSON_IPATH=$BSON_IPATH/libbson.h
+   echo DEBUG: MONGODB2_PATH=$MONGODB2_PATH
+   echo DEBUG: MONGODB2_IPATH=$MONGODB2_IPATH
+   echo DEBUG: BSON2_PATH=$BSON2_PATH
+   echo DEBUG: BSON2_IPATH=$BSON2_IPATH
 fi

-  if [ -n "$MONGODB_PATH" -a -n "$MONGODB_IPATH" -a -n "$BSON_PATH" -a -n "$BSON_IPATH" ]; then
+  if [ -n "$MONGODB2_PATH" -a -n "$MONGODB2_IPATH" -a -n "$BSON2_PATH" -a -n "$BSON2_IPATH" ]; then
     echo "                                                                 ... found"
   fi
-  if [ "X" = "X$MONGODB_PATH" -o "X" = "X$MONGODB_IPATH" -o "X" = "X$BSON_PATH" -o "X" = "X$BSON_IPATH" ]; then
-    echo "                                                                 ... NOT found, module mongodb disabled"
-    MONGODB_PATH=""
-    MONGODB_IPATH=""
-    BSON_PATH=""
-    BSON_IPATH=""
+  if [ "X" = "X$MONGODB2_PATH" -o "X" = "X$MONGODB2_IPATH" -o "X" = "X$BSON2_PATH" -o "X" = "X$BSON2_IPATH" ]; then
+    echo "                                                                 ... NOT found, module mongodb2 disabled"
+    MONGODB2_PATH=""
+    MONGODB2_IPATH=""
+    BSON2_PATH=""
+    BSON2_IPATH=""
   fi

+if [ "X" = "X$MONGODB2_PATH" -o "X" = "X$MONGODB2_IPATH" -o "X" = "X$BSON2_PATH" -o "X" = "X$BSON2_IPATH" ]; then
+    echo "Checking for Mongodb (libmongoc-1.0/mongoc.h/libbson-1.0/bson.h) ..."
+
+      for i in $LIBDIRS ; do
+        if [ "X" = "X$MONGODB_PATH" ]; then
+            if [ -f "$i/libmongoc-1.0.so" -o -f "$i/libmongoc-1.0.dylib" -o -f "$i/libmongoc-1.0.a" ]; then
+                MONGODB_PATH="$i"
+            fi
+        fi
+        if [ "X" = "X$MONGODB_PATH" ]; then
+            TMP_LIB=`/bin/ls $i/libmongoc-*.so* 2> /dev/null | grep mongoc`
+            if [ -n "$TMP_LIB" ]; then
+              MONGODB_PATH="$i"
+            fi
+        fi
+        if [ "X" = "X$MONGODB_PATH" ]; then
+            TMP_LIB=`/bin/ls $i/libmongoc.dll* 2> /dev/null | grep mongoc`
+            if [ -n "$TMP_LIB" ]; then
+              MONGODB_PATH="$i"
+            fi
+        fi
+      done
+
+      MONGODB_IPATH=
+      for i in $INCDIRS ; do
+        if [ "X" = "X$MONGODB_IPATH" ]; then
+            if [ -f "$i/mongoc.h" ]; then
+                MONGODB_IPATH="$i"
+            fi
+            if [ -f "$i/libmongoc/mongoc.h" ]; then
+                MONGODB_IPATH="$i/libmongoc"
+            fi
+            if [ -f "$i/libmongoc-1.0/mongoc.h" ]; then
+                MONGODB_IPATH="$i/libmongoc-1.0"
+            fi
+        fi
+      done
+
+     for i in $LIBDIRS ; do
+        if [ "X" = "X$BSON_PATH" ]; then
+            if [ -f "$i/libbson-1.0.so" -o -f "$i/libbson-1.0.dylib" -o -f "$i/libbson-1.0.a" ]; then
+                BSON_PATH="$i"
+            fi
+        fi
+        if [ "X" = "X$BSON_PATH" ]; then
+            TMP_LIB=`/bin/ls $i/libbson-*.so* 2> /dev/null | grep mongoc`
+            if [ -n "$TMP_LIB" ]; then
+              BSON_PATH="$i"
+            fi
+        fi
+        if [ "X" = "X$BSON_PATH" ]; then
+            TMP_LIB=`/bin/ls $i/libbson.dll* 2> /dev/null | grep mongoc`
+            if [ -n "$TMP_LIB" ]; then
+              BSON_PATH="$i"
+            fi
+        fi
+      done
+
+      BSON_IPATH=
+      for i in $INCDIRS ; do
+        if [ "X" = "X$BSON_IPATH" ]; then
+            if [ -f "$i/bson.h" ]; then
+                BSON_IPATH="$i"
+            fi
+            if [ -f "$i/libbson/bson.h" ]; then
+                BSON_IPATH="$i/libbson"
+            fi
+            if [ -f "$i/libbson-1.0/bson.h" ]; then
+                BSON_IPATH="$i/libbson-1.0"
+            fi
+        fi
+      done
+
+    if [ "X" != "X$DEBUG" ]; then
+       echo DEBUG: MONGODB_PATH=$MONGODB_PATH/libmongoc
+       echo DEBUG: MONGODB_IPATH=$MONGODB_IPATH/libmongoc.h
+       echo DEBUG: BSON_PATH=$BSON_PATH/libbson
+       echo DEBUG: BSON_IPATH=$BSON_IPATH/libbson.h
+    fi
+
+      if [ -n "$MONGODB_PATH" -a -n "$MONGODB_IPATH" -a -n "$BSON_PATH" -a -n "$BSON_IPATH" ]; then
+        echo "                                                                 ... found"
+      fi
+      if [ "X" = "X$MONGODB_PATH" -o "X" = "X$MONGODB_IPATH" -o "X" = "X$BSON_PATH" -o "X" = "X$BSON_IPATH" ]; then
+        echo "                                                                 ... NOT found, module mongodb disabled"
+        MONGODB_PATH=""
+        MONGODB_IPATH=""
+        BSON_PATH=""
+        BSON_IPATH=""
+      fi
+fi
+
 echo "Checking for smbclient (libsmbclient/libsmbclient.h) ..."

   for i in $LIBDIRS ; do
@@ -1537,6 +1637,12 @@
 if [ -n "$MCACHED_PATH" ]; then
     XDEFINES="$XDEFINES -DLIBMCACHED"
 fi
+if [ -n "$MONGODB2_PATH" ]; then
+    XDEFINES="$XDEFINES -DLIBMONGODB2"
+fi
+if [ -n "$BSON2_PATH" ]; then
+    XDEFINES="$XDEFINES -DLIBBSON2"
+fi
 if [ -n "$MONGODB_PATH" ]; then
     XDEFINES="$XDEFINES -DLIBMONGODB"
 fi
@@ -1579,6 +1685,8 @@
              $AFP_PATH \
              $MYSQL_PATH \
              $MCACHED_PATH \
+             $MONGODB2_PATH \
+             $BSON2_PATH \
              $MONGODB_PATH \
              $BSON_PATH \
              $FREERDP2_PATH \
@@ -1641,6 +1749,9 @@
 if [ -n "$MCACHED_IPATH" ]; then
     XIPATHS="$XIPATHS -I$MCACHED_IPATH"
 fi
+if [ -n "$MONGODB2_IPATH" ]; then
+    XIPATHS="$XIPATHS -I$MONGODB2_IPATH -I$BSON2_IPATH"
+fi
 if [ -n "$MONGODB_IPATH" ]; then
     XIPATHS="$XIPATHS -I$MONGODB_IPATH -I$BSON_IPATH"
 fi
@@ -1725,6 +1836,12 @@
 if [ -n "$MCACHED_PATH" ]; then
     XLIBS="$XLIBS -lmemcached"
 fi
+if [ -n "$MONGODB2_PATH" ]; then
+    XLIBS="$XLIBS -lmongoc2"
+fi
+if [ -n "$BSON2_PATH" ]; then
+    XLIBS="$XLIBS -lbson2"
+fi
 if [ -n "$MONGODB_PATH" ]; then
     XLIBS="$XLIBS -lmongoc-1.0"
 fi
--- a/hydra-mongodb.c
+++ b/hydra-mongodb.c
@@ -2,13 +2,16 @@
 // Tested on mongodb-server 1:3.6.3-0ubuntu1
 // MONGODB-CR is been deprecated

+#ifdef LIBMONGODB2
+#include <mongoc/mongoc.h>
+#endif
 #ifdef LIBMONGODB
 #include <mongoc.h>
 #endif

 #include "hydra-mod.h"

-#ifndef LIBMONGODB
+#if !defined(LIBMONGODB2) && !defined(LIBMONGODB)
 void dummy_mongodb() { printf("\n"); }
 #else

--- a/hydra.c
+++ b/hydra.c
@@ -161,7 +161,7 @@
 extern void service_mcached(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
 extern int32_t service_mcached_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
 #endif
-#ifdef LIBMONGODB
+#if defined(LIBMONGODB2) || defined(LIBMONGODB)
 extern void service_mongodb(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
 extern int32_t service_mongodb_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
 #endif
@@ -411,7 +411,7 @@
 #endif
                 SERVICE(mssql),
                 SERVICE(cobaltstrike),
-#ifdef LIBMONGODB
+#if defined(LIBMONGODB2) || defined(LIBMONGODB)
                 SERVICE3("mongodb", mongodb),
 #endif
 #ifdef HAVE_MATH_H
@@ -2275,7 +2275,7 @@
   SERVICES = hydra_string_replace(SERVICES, "memcached ", "");
   strcat(unsupported, "memcached ");
 #endif
-#ifndef LIBMONGODB
+#if !defined(LIBMONGODB2) && !defined(LIBMONGODB)
   SERVICES = hydra_string_replace(SERVICES, "mongodb ", "");
   strcat(unsupported, "mongodb ");
 #endif
@@ -2874,7 +2874,7 @@
 #endif

     if (strcmp(hydra_options.service, "mongodb") == 0)
-#ifdef LIBMONGODB
+#if defined(LIBMONGODB2) || defined(LIBMONGODB)
     {
       i = 1;
       if (hydra_options.miscptr == NULL || (strlen(hydra_options.miscptr) == 0))