diff --git a/.gitignore b/.gitignore index 29e5d65..0b35231 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,7 @@ cmd/server/server cmd/worker/worker *.p12 config.json -.DS_Store \ No newline at end of file +.DS_Store + +.devenv +config.yaml \ No newline at end of file diff --git a/api/server.go b/api/server.go index c7aef2c..208942b 100644 --- a/api/server.go +++ b/api/server.go @@ -18,18 +18,20 @@ import ( ) type Server struct { - port int64 - sdClient *statsd.Client - logger *logrus.Logger - db *storage.Database - queueClient *asynq.Client - cacheClient *cache.RedisStorage + port int64 + sdClient *statsd.Client + logger *logrus.Logger + db *storage.Database + queueClient *asynq.Client + cacheClient *cache.RedisStorage + vapidPublicKey string } func NewServer(port int64, sdClient *statsd.Client, db *storage.Database, queueClient *asynq.Client, - cacheClient *cache.RedisStorage) (*Server, error) { + cacheClient *cache.RedisStorage, + vapidPublicKey string) (*Server, error) { if port <= 0 { return nil, fmt.Errorf("invalid port number: %d", port) } @@ -46,12 +48,13 @@ func NewServer(port int64, sdClient *statsd.Client, return nil, fmt.Errorf("cache client is nil") } return &Server{ - port: port, - sdClient: sdClient, - logger: logrus.WithField("module", "api").Logger, - db: db, - queueClient: queueClient, - cacheClient: cacheClient, + port: port, + sdClient: sdClient, + logger: logrus.WithField("module", "api").Logger, + db: db, + queueClient: queueClient, + cacheClient: cacheClient, + vapidPublicKey: vapidPublicKey, }, nil } @@ -72,6 +75,7 @@ func (s *Server) StartServer() error { e.POST("/register", s.Register) e.GET("/vault/:vault_id", s.IsVaultRegistered) e.POST("/notify", s.SendNotification) + e.GET("/vapid-public-key", s.GetVAPIDPublicKey) return e.Start(fmt.Sprintf(":%d", s.port)) } @@ -94,6 +98,10 @@ func (s *Server) Ping(c echo.Context) error { return c.String(http.StatusOK, "Vultisig notification server is running") } +func (s *Server) GetVAPIDPublicKey(c echo.Context) error { + return c.JSON(http.StatusOK, map[string]string{"public_key": s.vapidPublicKey}) +} + // Register handles device registration for push notifications // @Summary Register a device for push notifications // @Description Registers a device using its token and platform (iOS/Android). diff --git a/cmd/server/main.go b/cmd/server/main.go index dba5e93..04eda9c 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -52,7 +52,7 @@ func main() { log.Printf("fail to close asynq client,err: %v", err) } }() - apiServer, err := api.NewServer(cfg.Server.Port, sdClient, db, client, cacheClient) + apiServer, err := api.NewServer(cfg.Server.Port, sdClient, db, client, cacheClient, cfg.VAPIDPublicKey) if err != nil { panic(err) } diff --git a/cmd/worker/main.go b/cmd/worker/main.go index ebdf131..d3e349d 100644 --- a/cmd/worker/main.go +++ b/cmd/worker/main.go @@ -33,7 +33,7 @@ func main() { panic(err) } - workerServce, err := service.NewNotificationService(sdClient, db, "https://api.vultisig.com", cfg.Certificate, cfg.CertificatePassword, cfg.Production) + workerServce, err := service.NewNotificationService(sdClient, db, "https://api.vultisig.com", cfg.Certificate, cfg.CertificatePassword, cfg.Production, cfg.VAPIDPublicKey, cfg.VAPIDPrivateKey, cfg.VAPIDSubscriber) if err != nil { panic(err) } diff --git a/config/config.go b/config/config.go index 0bdf751..2403b10 100644 --- a/config/config.go +++ b/config/config.go @@ -16,6 +16,9 @@ type Config struct { Certificate string `mapstructure:"certificate" json:"certificate,omitempty"` CertificatePassword string `mapstructure:"certificate-password" json:"certificate-password,omitempty"` Production bool `mapstructure:"production" json:"production,omitempty"` + VAPIDPublicKey string `mapstructure:"vapid-public-key" json:"vapid-public-key,omitempty"` + VAPIDPrivateKey string `mapstructure:"vapid-private-key" json:"vapid-private-key,omitempty"` + VAPIDSubscriber string `mapstructure:"vapid-subscriber" json:"vapid-subscriber,omitempty"` } type DatabaseConfig struct { Database string `mapstructure:"database" json:"database,omitempty"` diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..e52b899 --- /dev/null +++ b/flake.lock @@ -0,0 +1,306 @@ +{ + "nodes": { + "cachix": { + "inputs": { + "devenv": [ + "devenv" + ], + "flake-compat": [ + "devenv", + "flake-compat" + ], + "git-hooks": [ + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760971495, + "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=", + "owner": "cachix", + "repo": "cachix", + "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, + "devenv": { + "inputs": { + "cachix": "cachix", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "nix": "nix", + "nixd": "nixd", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1771591269, + "narHash": "sha256-622D5k9sfSlz3g5ciR/daouw8QKSA63p3CC9HQttOvU=", + "owner": "cachix", + "repo": "devenv", + "rev": "cd2ec51a7bd74a9a9527c0145b8449c6110050d4", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-root": { + "locked": { + "lastModified": 1723604017, + "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", + "owner": "srid", + "repo": "flake-root", + "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "devenv", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "devenv", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": [ + "devenv", + "flake-compat" + ], + "flake-parts": [ + "devenv", + "flake-parts" + ], + "git-hooks-nix": [ + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-23-11": [ + "devenv" + ], + "nixpkgs-regression": [ + "devenv" + ] + }, + "locked": { + "lastModified": 1771532737, + "narHash": "sha256-H26FQmOyvIGnedfAioparJQD8Oe+/byD6OpUpnI/hkE=", + "owner": "cachix", + "repo": "nix", + "rev": "7eb6c427c7a86fdc3ebf9e6cbf2a84e80e8974fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "devenv-2.32", + "repo": "nix", + "type": "github" + } + }, + "nixd": { + "inputs": { + "flake-parts": [ + "devenv", + "flake-parts" + ], + "flake-root": "flake-root", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1763964548, + "narHash": "sha256-JTRoaEWvPsVIMFJWeS4G2isPo15wqXY/otsiHPN0zww=", + "owner": "nix-community", + "repo": "nixd", + "rev": "d4bf15e56540422e2acc7bc26b20b0a0934e3f5e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1761313199, + "narHash": "sha256-wCIACXbNtXAlwvQUo1Ed++loFALPjYUA3dpcUJiXO44=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "d1c30452ebecfc55185ae6d1c983c09da0c274ff", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1771207753, + "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "devenv": "devenv", + "nixpkgs": "nixpkgs_2", + "systems": "systems" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "devenv", + "nixd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..5325609 --- /dev/null +++ b/flake.nix @@ -0,0 +1,57 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + systems.url = "github:nix-systems/default"; + devenv.url = "github:cachix/devenv"; + }; + + outputs = { self, nixpkgs, devenv, systems, ... } @ inputs: + let + forEachSystem = nixpkgs.lib.genAttrs (import systems); + in + { + devShells = forEachSystem + (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + default = devenv.lib.mkShell { + inherit inputs pkgs; + modules = [ + { + languages.go = { + enable = true; + }; + + services.mysql = { + enable = true; + package = pkgs.mysql84; + initialDatabases = [ + { + name = "notification"; + } + ]; + }; + + services.redis = { + enable = true; + package = pkgs.redis; + }; + + packages = with pkgs; [ + go-ethereum + sqlc + goose + tailwindcss + ]; + + enterShell = '' + echo "notification shell started!" + ''; + } + ]; + }; + }); + }; +} diff --git a/go.mod b/go.mod index 042f6a1..779dd14 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,12 @@ go 1.25.0 require ( github.com/DataDog/datadog-go v4.8.3+incompatible + github.com/SherClockHolmes/webpush-go v1.4.0 + github.com/hibiken/asynq v0.25.1 github.com/labstack/echo/v4 v4.13.4 github.com/labstack/gommon v0.4.2 github.com/redis/go-redis/v9 v9.14.0 + github.com/sideshow/apns2 v0.25.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/viper v1.21.0 gorm.io/driver/mysql v1.6.0 @@ -22,8 +25,8 @@ require ( github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect + github.com/golang-jwt/jwt/v5 v5.2.1 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/hibiken/asynq v0.25.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/mattn/go-colorable v0.1.14 // indirect @@ -31,7 +34,6 @@ require ( github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sagikazarmark/locafero v0.11.0 // indirect - github.com/sideshow/apns2 v0.25.0 // indirect github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect github.com/spf13/afero v1.15.0 // indirect github.com/spf13/cast v1.10.0 // indirect diff --git a/go.sum b/go.sum index 8be3f44..4c3e7e9 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bp github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/SherClockHolmes/webpush-go v1.4.0 h1:ocnzNKWN23T9nvHi6IfyrQjkIc0oJWv1B1pULsf9i3s= +github.com/SherClockHolmes/webpush-go v1.4.0/go.mod h1:XSq8pKX11vNV8MJEMwjrlTkxhAj1zKfxmyhdV7Pd6UA= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20201120081800-1786d5ef83d4/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= @@ -28,6 +30,8 @@ github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlnd github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= +github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -89,35 +93,88 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20170512130425-ab89591268e0/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= -golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220403103023-749bd193bc2b/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= diff --git a/models/device.go b/models/device.go index 2d86da9..49d1dfb 100644 --- a/models/device.go +++ b/models/device.go @@ -9,8 +9,8 @@ import ( type Device struct { VaultId string `gorm:"type:varchar(255);not null" json:"vault_id" binding:"required"` PartyName string `gorm:"type:varchar(255);not null" json:"party_name" binding:"required"` - Token string `gorm:"type:varchar(255);not null" json:"token" binding:"required"` - DeviceType string `gorm:"type:varchar(255);not null" json:"device_type" binding:"required"` // ios or android + Token string `gorm:"type:text;not null" json:"token" binding:"required"` + DeviceType string `gorm:"type:varchar(255);not null" json:"device_type" binding:"required"` // apple, android, or web } type DeviceDBModel struct { diff --git a/service/notification.go b/service/notification.go index 14b426a..1d01a56 100644 --- a/service/notification.go +++ b/service/notification.go @@ -8,6 +8,7 @@ import ( "time" "github.com/DataDog/datadog-go/statsd" + webpush "github.com/SherClockHolmes/webpush-go" "github.com/hibiken/asynq" "github.com/sideshow/apns2" "github.com/sideshow/apns2/certificate" @@ -21,18 +22,22 @@ import ( const appID = "com.vultisig.wallet" type NotificationService struct { - logger *logrus.Logger - sdClient *statsd.Client - db *storage.Database - imageServer string - certificate string - password string - isProd bool + logger *logrus.Logger + sdClient *statsd.Client + db *storage.Database + imageServer string + certificate string + password string + isProd bool + vapidPublicKey string + vapidPrivateKey string + vapidSubscriber string } func NewNotificationService(sdClient *statsd.Client, db *storage.Database, - imageServer, certificate, password string, isProd bool) (*NotificationService, error) { + imageServer, certificate, password string, isProd bool, + vapidPublicKey, vapidPrivateKey, vapidSubscriber string) (*NotificationService, error) { if sdClient == nil { return nil, fmt.Errorf("sdClient is nil") } @@ -40,13 +45,16 @@ func NewNotificationService(sdClient *statsd.Client, return nil, fmt.Errorf("db is nil") } return &NotificationService{ - logger: logrus.WithField("service", "notification").Logger, - sdClient: sdClient, - db: db, - imageServer: imageServer, - certificate: certificate, - password: password, - isProd: isProd, + logger: logrus.WithField("service", "notification").Logger, + sdClient: sdClient, + db: db, + imageServer: imageServer, + certificate: certificate, + password: password, + isProd: isProd, + vapidPublicKey: vapidPublicKey, + vapidPrivateKey: vapidPrivateKey, + vapidSubscriber: vapidSubscriber, }, nil } func (s *NotificationService) incCounter(name string, tags []string) { @@ -112,6 +120,11 @@ func (s *NotificationService) processNotificationRequest(ctx context.Context, re s.logger.Errorf("failed to process android notification: %v", err) } } + if strings.EqualFold(device.DeviceType, "web") { + if err := s.processWebPushNotification(ctx, device, request); err != nil { + s.logger.Errorf("failed to process web push notification: %v", err) + } + } } return nil } @@ -162,3 +175,52 @@ func (s *NotificationService) processAndroidNotification(ctx context.Context, de // TODO: implement android notification return nil } + +func (s *NotificationService) processWebPushNotification(ctx context.Context, device models.DeviceDBModel, request models.NotificationRequest) error { + defer s.measureTime("notification.web.duration", time.Now(), []string{}) + + var subscription webpush.Subscription + if err := json.Unmarshal([]byte(device.Token), &subscription); err != nil { + s.logger.Errorf("failed to unmarshal web push subscription for vault %s: %v", device.VaultId, err) + if unregErr := s.db.UnregisterDevice(ctx, device.VaultId, device.Token); unregErr != nil { + s.logger.Errorf("failed to unregister device with invalid subscription: %v", unregErr) + } + return fmt.Errorf("failed to unmarshal web push subscription: %w", err) + } + + payloadData := map[string]string{ + "title": "Vultisig Keysign request", + "subtitle": "Vault: " + request.VaultName, + "body": request.QRCodeData, + } + payloadBytes, err := json.Marshal(payloadData) + if err != nil { + return fmt.Errorf("failed to marshal web push payload: %w", err) + } + + resp, err := webpush.SendNotification(payloadBytes, &subscription, &webpush.Options{ + Subscriber: s.vapidSubscriber, + VAPIDPublicKey: s.vapidPublicKey, + VAPIDPrivateKey: s.vapidPrivateKey, + TTL: 60, + Urgency: webpush.UrgencyHigh, + }) + if err != nil { + return fmt.Errorf("failed to send web push notification: %w", err) + } + defer resp.Body.Close() + + if resp.StatusCode == 404 || resp.StatusCode == 410 { + s.logger.Infof("web push subscription expired (HTTP %d) for vault %s, unregistering", resp.StatusCode, device.VaultId) + if err := s.db.UnregisterDevice(ctx, device.VaultId, device.Token); err != nil { + s.logger.Errorf("failed to unregister expired web push device: %v", err) + } + return nil + } + + if resp.StatusCode >= 400 { + s.logger.Errorf("web push notification failed with HTTP %d for vault %s", resp.StatusCode, device.VaultId) + } + + return nil +} diff --git a/service/notification_test.go b/service/notification_test.go index 65ad375..18e321c 100644 --- a/service/notification_test.go +++ b/service/notification_test.go @@ -4,6 +4,7 @@ import ( "encoding/json" "testing" + webpush "github.com/SherClockHolmes/webpush-go" "github.com/sideshow/apns2/payload" "github.com/vultisig/notification/models" ) @@ -26,3 +27,55 @@ func TestAPNPayload(t *testing.T) { } t.Log(string(buf)) } + +func TestWebPushPayload(t *testing.T) { + request := models.NotificationRequest{ + VaultId: "test-vault-id", + VaultName: "MyVault", + QRCodeData: "qr-data-here", + } + + payloadData := map[string]string{ + "title": "Vultisig Keysign request", + "subtitle": "Vault: " + request.VaultName, + "body": request.QRCodeData, + } + buf, err := json.Marshal(payloadData) + if err != nil { + t.Fatalf("failed to marshal web push payload: %v", err) + } + + var result map[string]string + if err := json.Unmarshal(buf, &result); err != nil { + t.Fatalf("failed to unmarshal web push payload: %v", err) + } + + if result["title"] != "Vultisig Keysign request" { + t.Errorf("expected title 'Vultisig Keysign request', got '%s'", result["title"]) + } + if result["subtitle"] != "Vault: MyVault" { + t.Errorf("expected subtitle 'Vault: MyVault', got '%s'", result["subtitle"]) + } + if result["body"] != "qr-data-here" { + t.Errorf("expected body 'qr-data-here', got '%s'", result["body"]) + } +} + +func TestWebPushSubscriptionUnmarshal(t *testing.T) { + subscriptionJSON := `{"endpoint":"https://fcm.googleapis.com/fcm/send/example","keys":{"p256dh":"BNcRd...","auth":"tBHI..."}}` + + var subscription webpush.Subscription + if err := json.Unmarshal([]byte(subscriptionJSON), &subscription); err != nil { + t.Fatalf("failed to unmarshal subscription: %v", err) + } + + if subscription.Endpoint != "https://fcm.googleapis.com/fcm/send/example" { + t.Errorf("expected endpoint 'https://fcm.googleapis.com/fcm/send/example', got '%s'", subscription.Endpoint) + } + if subscription.Keys.P256dh != "BNcRd..." { + t.Errorf("expected p256dh 'BNcRd...', got '%s'", subscription.Keys.P256dh) + } + if subscription.Keys.Auth != "tBHI..." { + t.Errorf("expected auth 'tBHI...', got '%s'", subscription.Keys.Auth) + } +}