From e2afd85cca452aefd086353eeba9103e5727d75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=B1=E8=88=9E=E8=80=85?= <shadow1ng@qq.com>
Date: Mon, 13 Nov 2023 10:52:44 +0800
Subject: [PATCH] Update oracle.go

---
 Plugins/oracle.go | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/Plugins/oracle.go b/Plugins/oracle.go
index 526057d..0db4142 100644
--- a/Plugins/oracle.go
+++ b/Plugins/oracle.go
@@ -3,23 +3,22 @@ package Plugins
 import (
 	"database/sql"
 	"fmt"
-	"strings"
-	"time"
-
 	"github.com/shadow1ng/fscan/common"
 	_ "github.com/sijms/go-ora/v2"
+	"strings"
+	"time"
 )
 
-func OracleScan(info common.HostInfo, flags common.Flags) (tmperr error) {
-	if flags.IsBrute {
+func OracleScan(info *common.HostInfo) (tmperr error) {
+	if common.IsBrute {
 		return
 	}
 	starttime := time.Now().Unix()
 	for _, user := range common.Userdict["oracle"] {
 		for _, pass := range common.Passwords {
 			pass = strings.Replace(pass, "{user}", user, -1)
-			flag, err := OracleConn(info, user, pass, flags.Timeout)
-			if flag && err == nil {
+			flag, err := OracleConn(info, user, pass)
+			if flag == true && err == nil {
 				return err
 			} else {
 				errlog := fmt.Sprintf("[-] oracle %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
@@ -28,7 +27,7 @@ func OracleScan(info common.HostInfo, flags common.Flags) (tmperr error) {
 				if common.CheckErrs(err) {
 					return err
 				}
-				if time.Now().Unix()-starttime > (int64(len(common.Userdict["oracle"])*len(common.Passwords)) * flags.Timeout) {
+				if time.Now().Unix()-starttime > (int64(len(common.Userdict["oracle"])*len(common.Passwords)) * common.Timeout) {
 					return err
 				}
 			}
@@ -37,14 +36,14 @@ func OracleScan(info common.HostInfo, flags common.Flags) (tmperr error) {
 	return tmperr
 }
 
-func OracleConn(info common.HostInfo, user string, pass string, timeout int64) (flag bool, err error) {
+func OracleConn(info *common.HostInfo, user string, pass string) (flag bool, err error) {
 	flag = false
 	Host, Port, Username, Password := info.Host, info.Ports, user, pass
 	dataSourceName := fmt.Sprintf("oracle://%s:%s@%s:%s/orcl", Username, Password, Host, Port)
 	db, err := sql.Open("oracle", dataSourceName)
 	if err == nil {
-		db.SetConnMaxLifetime(time.Duration(timeout) * time.Second)
-		db.SetConnMaxIdleTime(time.Duration(timeout) * time.Second)
+		db.SetConnMaxLifetime(time.Duration(common.Timeout) * time.Second)
+		db.SetConnMaxIdleTime(time.Duration(common.Timeout) * time.Second)
 		db.SetMaxIdleConns(0)
 		defer db.Close()
 		err = db.Ping()