Skip to content

feat(protocol): forward Oracle SYSDBA option #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zxc4wonder merged 2 commits into from
Aug 21, 2026
Merged

feat(protocol): forward Oracle SYSDBA option #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d48749
feat(protocol): forward Oracle SYSDBA option
Zxc4wonder Aug 21, 2026
3dc958c
refactor(protocol): forward generic connect options
Zxc4wonder Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions cmd/impl/convert_pb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package impl

import (
"encoding/json"
"fmt"
"sort"
"strconv"
Expand Down Expand Up @@ -243,6 +244,28 @@ func ConvertToPbSetting(setting *model.TerminalConfig) *pb.ComponentSetting {
}
}

func ConvertToPbConnectOptions(options model.ConnectOptions) *pb.ConnectOptions {
settings := make(map[string]string)
data, err := json.Marshal(options)
if err != nil {
return &pb.ConnectOptions{Settings: settings}
}
rawOptions := make(map[string]json.RawMessage)
if err = json.Unmarshal(data, &rawOptions); err != nil {
return &pb.ConnectOptions{Settings: settings}
}
settings = make(map[string]string, len(rawOptions))
for key, value := range rawOptions {
var stringValue string
if err := json.Unmarshal(value, &stringValue); err == nil {
settings[key] = stringValue
continue
}
settings[key] = string(value)
}
return &pb.ConnectOptions{Settings: settings}
}

func ConvertToPbPlatform(platform *model.Platform) *pb.Platform {
return &pb.Platform{
Id: int32(platform.ID),
Expand Down
1 change: 1 addition & 0 deletions cmd/impl/jms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ func (j *JMServer) GetTokenAuthInfo(ctx context.Context, req *pb.TokenRequest) (
Platform: ConvertToPbPlatform(&tokenAuthInfo.Platform),
DataMaskingRules: ConvertToDataMaskingRules(tokenAuthInfo.DataMaskingRules),
FaceMonitorToken: tokenAuthInfo.FaceMonitorToken,
ConnectOptions: ConvertToPbConnectOptions(tokenAuthInfo.ConnectOptions),
}
status.Ok = true
logger.Debugf("Get database auth info success by token: %s", req.Token)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.24.6

require (
github.com/gorilla/websocket v1.5.3
github.com/jumpserver-dev/sdk-go v0.0.0-20260727030641-b0cef8e97370
github.com/jumpserver-dev/sdk-go v0.0.0-20260821083952-82cf2e23d207
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.10.1
github.com/spf13/viper v1.21.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
github.com/jumpserver-dev/sdk-go v0.0.0-20260727030641-b0cef8e97370 h1:6QDjMGSy908FCCaJsr1dqSECV51ZskWK5n/Glb4dsH8=
github.com/jumpserver-dev/sdk-go v0.0.0-20260727030641-b0cef8e97370/go.mod h1:QmnL7BRb74/XY1nu8kWQWs6DHXt3uIaWkDCkQSRyZlM=
github.com/jumpserver-dev/sdk-go v0.0.0-20260821083952-82cf2e23d207 h1:hbYIaxsxF47XyTGRxxKt74lmPaGjjNlYBomnaSEhnR8=
github.com/jumpserver-dev/sdk-go v0.0.0-20260821083952-82cf2e23d207/go.mod h1:QmnL7BRb74/XY1nu8kWQWs6DHXt3uIaWkDCkQSRyZlM=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
Expand Down
Loading