Skip to content

Commit e3e2878

Browse files
committed
Revert "adding shared redis storage"
This reverts commit 1de1ea2.
1 parent 1de1ea2 commit e3e2878

11 files changed

Lines changed: 2 additions & 1211 deletions

File tree

cmd/interactsh-server/main.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ func main() {
7373
flagSet.StringVarP(&cliOptions.DefaultHTTPResponseFile, "default-http-response", "dhr", "", "file to serve for all http requests (takes priority over other options)"),
7474
flagSet.BoolVarP(&cliOptions.DiskStorage, "disk", "ds", false, "disk based storage"),
7575
flagSet.StringVarP(&cliOptions.DiskStoragePath, "disk-path", "dsp", "", "disk storage path"),
76-
flagSet.StringVarP(&cliOptions.RedisURL, "redis-url", "ru", "", "redis connection URL (enables shared state for multi-instance deployments)"),
77-
flagSet.StringVarP(&cliOptions.RedisKeyPrefix, "redis-prefix", "rp", "", "redis key prefix (default \"interactsh:\")"),
7876
flagSet.StringVarP(&cliOptions.HeaderServer, "server-header", "csh", "", "custom value of Server header in response"),
7977
flagSet.BoolVarP(&cliOptions.NoVersionHeader, "disable-version", "dv", false, "disable publishing interactsh version in response header"),
8078
)
@@ -264,24 +262,7 @@ func main() {
264262
}
265263

266264
var err error
267-
switch {
268-
case cliOptions.RedisURL != "":
269-
// Redis-backed storage shares state across multiple interactsh-server
270-
// instances behind a load balancer. Disk/in-memory flags are ignored
271-
// in this mode by design.
272-
if cliOptions.DiskStorage {
273-
gologger.Warning().Msgf("--redis-url is set; disk-storage flags will be ignored\n")
274-
}
275-
store, err = storage.NewRedis(&storage.RedisOptions{
276-
URL: cliOptions.RedisURL,
277-
KeyPrefix: cliOptions.RedisKeyPrefix,
278-
EvictionTTL: evictionTTL,
279-
EvictionStrategy: evictionStrategy,
280-
MaxSharedInteractions: storeOptions.MaxSharedInteractions,
281-
})
282-
default:
283-
store, err = storage.New(&storeOptions)
284-
}
265+
store, err = storage.New(&storeOptions)
285266
if err != nil {
286267
gologger.Fatal().Msgf("couldn't create storage: %s\n", err)
287268
}

deploy/redis-test/Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

deploy/redis-test/docker-compose.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

deploy/redis-test/verify/main.go

Lines changed: 0 additions & 117 deletions
This file was deleted.

go.mod

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ require (
4343
github.com/VividCortex/ewma v1.2.0 // indirect
4444
github.com/akrylysov/pogreb v0.10.2 // indirect
4545
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
46-
github.com/alicebob/miniredis/v2 v2.38.0 // indirect
4746
github.com/andybalholm/brotli v1.2.0 // indirect
4847
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4948
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
@@ -53,7 +52,6 @@ require (
5352
github.com/bodgit/sevenzip v1.6.1 // indirect
5453
github.com/bodgit/windows v1.0.1 // indirect
5554
github.com/caddyserver/zerossl v0.1.3 // indirect
56-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5755
github.com/charmbracelet/colorprofile v0.3.2 // indirect
5856
github.com/charmbracelet/glamour v0.10.0 // indirect
5957
github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834 // indirect
@@ -122,7 +120,6 @@ require (
122120
github.com/projectdiscovery/machineid v0.0.0-20250715113114-c77eb3567582 // indirect
123121
github.com/projectdiscovery/mapcidr v1.1.97 // indirect
124122
github.com/projectdiscovery/networkpolicy v0.1.38 // indirect
125-
github.com/redis/go-redis/v9 v9.19.0 // indirect
126123
github.com/refraction-networking/utls v1.8.2 // indirect
127124
github.com/rivo/uniseg v0.4.7 // indirect
128125
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
@@ -144,14 +141,13 @@ require (
144141
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
145142
github.com/yuin/goldmark v1.7.13 // indirect
146143
github.com/yuin/goldmark-emoji v1.0.6 // indirect
147-
github.com/yuin/gopher-lua v1.1.1 // indirect
148144
github.com/yusufpapurcu/wmi v1.2.4 // indirect
149145
github.com/zcalusic/sysinfo v1.1.3 // indirect
150146
github.com/zeebo/blake3 v0.2.4 // indirect
151147
github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect
152148
github.com/zmap/zcrypto v0.0.0-20240803002437-3a861682ac77 // indirect
153149
go.etcd.io/bbolt v1.4.3 // indirect
154-
go.uber.org/atomic v1.11.0 // indirect
150+
go.uber.org/atomic v1.10.0 // indirect
155151
go.uber.org/zap/exp v0.3.0 // indirect
156152
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
157153
golang.org/x/crypto v0.46.0 // indirect

go.sum

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg
4848
github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
4949
github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e h1:4dAU9FXIyQktpoUAgOJK3OTFc/xug0PCXYCqU0FgDKI=
5050
github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
51-
github.com/alicebob/miniredis/v2 v2.38.0 h1:nZAzCR+Lj+Vxk4ZXzm2NuKq2O33RXj1XxJ2e2uP9jiw=
52-
github.com/alicebob/miniredis/v2 v2.38.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM=
5351
github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
5452
github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
5553
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
@@ -78,9 +76,6 @@ github.com/caddyserver/certmagic v0.25.0/go.mod h1:m9yB7Mud24OQbPHOiipAoyKPn9pKH
7876
github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA=
7977
github.com/caddyserver/zerossl v0.1.3/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
8078
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
81-
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
82-
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
83-
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
8479
github.com/charmbracelet/colorprofile v0.3.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqITmrvb1uTIiI=
8580
github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI=
8681
github.com/charmbracelet/glamour v0.10.0 h1:MtZvfwsYCx8jEPFJm3rIBFIMZUfUJ765oX8V6kXldcY=
@@ -359,8 +354,6 @@ github.com/projectdiscovery/retryablehttp-go v1.3.11/go.mod h1:oTy1TiZcfb9SdDqek
359354
github.com/projectdiscovery/utils v0.11.0 h1:CxImZSRyj9spy1wpB9HKJopr5MsIPm2r5iS8uyhAMoQ=
360355
github.com/projectdiscovery/utils v0.11.0/go.mod h1:q2mZngH1s4WDO3knYxG7iyP1KcxoRSORJCWSpCKFc1s=
361356
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
362-
github.com/redis/go-redis/v9 v9.19.0 h1:XPVaaPSnG6RhYf7p+rmSa9zZfeVAnWsH5h3lxthOm/k=
363-
github.com/redis/go-redis/v9 v9.19.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
364357
github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEvV+S9iJ2IdQo=
365358
github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM=
366359
github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E=
@@ -451,8 +444,6 @@ github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA=
451444
github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
452445
github.com/yuin/goldmark-emoji v1.0.6 h1:QWfF2FYaXwL74tfGOW5izeiZepUDroDJfWubQI9HTHs=
453446
github.com/yuin/goldmark-emoji v1.0.6/go.mod h1:ukxJDKFpdFb5x0a5HqbdlcKtebh086iJpI31LTKmWuA=
454-
github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
455-
github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
456447
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
457448
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
458449
github.com/zcalusic/sysinfo v1.1.3 h1:u/AVENkuoikKuIZ4sUEJ6iibpmQP6YpGD8SSMCrqAF0=
@@ -481,8 +472,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
481472
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
482473
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
483474
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
484-
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
485-
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
486475
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
487476
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
488477
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

pkg/options/server_options.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ type CLIServerOptions struct {
5252
OriginIPHeader string
5353
DiskStorage bool
5454
DiskStoragePath string
55-
// RedisURL, when set, switches the server to a Redis-backed storage
56-
// backend so multiple instances can share state behind a load balancer.
57-
// Disk storage flags are ignored when RedisURL is set.
58-
RedisURL string
59-
RedisKeyPrefix string
6055
EnablePprof bool
6156
EnableMetrics bool
6257
Verbose bool

0 commit comments

Comments
 (0)