mirror of
https://github.com/safing/portmaster
synced 2025-04-20 10:59:10 +00:00
* Move portbase into monorepo * Add new simple module mgr * [WIP] Switch to new simple module mgr * Add StateMgr and more worker variants * [WIP] Switch more modules * [WIP] Switch more modules * [WIP] swtich more modules * [WIP] switch all SPN modules * [WIP] switch all service modules * [WIP] Convert all workers to the new module system * [WIP] add new task system to module manager * [WIP] Add second take for scheduling workers * [WIP] Add FIXME for bugs in new scheduler * [WIP] Add minor improvements to scheduler * [WIP] Add new worker scheduler * [WIP] Fix more bug related to new module system * [WIP] Fix start handing of the new module system * [WIP] Improve startup process * [WIP] Fix minor issues * [WIP] Fix missing subsystem in settings * [WIP] Initialize managers in constructor * [WIP] Move module event initialization to constrictors * [WIP] Fix setting for enabling and disabling the SPN module * [WIP] Move API registeration into module construction * [WIP] Update states mgr for all modules * [WIP] Add CmdLine operation support * Add state helper methods to module group and instance * Add notification and module status handling to status package * Fix starting issues * Remove pilot widget and update security lock to new status data * Remove debug logs * Improve http server shutdown * Add workaround for cleanly shutting down firewall+netquery * Improve logging * Add syncing states with notifications for new module system * Improve starting, stopping, shutdown; resolve FIXMEs/TODOs * [WIP] Fix most unit tests * Review new module system and fix minor issues * Push shutdown and restart events again via API * Set sleep mode via interface * Update example/template module * [WIP] Fix spn/cabin unit test * Remove deprecated UI elements * Make log output more similar for the logging transition phase * Switch spn hub and observer cmds to new module system * Fix log sources * Make worker mgr less error prone * Fix tests and minor issues * Fix observation hub * Improve shutdown and restart handling * Split up big connection.go source file * Move varint and dsd packages to structures repo * Improve expansion test * Fix linter warnings * Fix interception module on windows * Fix linter errors --------- Co-authored-by: Vladimir Stoilov <vladimir@safing.io>
70 lines
1.4 KiB
Go
70 lines
1.4 KiB
Go
package geoip
|
|
|
|
import (
|
|
"errors"
|
|
"sync/atomic"
|
|
|
|
"github.com/safing/portmaster/base/api"
|
|
"github.com/safing/portmaster/service/mgr"
|
|
"github.com/safing/portmaster/service/updates"
|
|
)
|
|
|
|
type GeoIP struct {
|
|
mgr *mgr.Manager
|
|
instance instance
|
|
}
|
|
|
|
func (g *GeoIP) Manager() *mgr.Manager {
|
|
return g.mgr
|
|
}
|
|
|
|
func (g *GeoIP) Start() error {
|
|
module.instance.Updates().EventResourcesUpdated.AddCallback(
|
|
"Check for GeoIP database updates",
|
|
func(_ *mgr.WorkerCtx, _ struct{}) (bool, error) {
|
|
worker.triggerUpdate()
|
|
return false, nil
|
|
})
|
|
return nil
|
|
}
|
|
|
|
func (g *GeoIP) Stop() error {
|
|
return nil
|
|
}
|
|
|
|
var (
|
|
module *GeoIP
|
|
shimLoaded atomic.Bool
|
|
)
|
|
|
|
// New returns a new GeoIP module.
|
|
func New(instance instance) (*GeoIP, error) {
|
|
if !shimLoaded.CompareAndSwap(false, true) {
|
|
return nil, errors.New("only one instance allowed")
|
|
}
|
|
|
|
m := mgr.New("geoip")
|
|
module = &GeoIP{
|
|
mgr: m,
|
|
instance: instance,
|
|
}
|
|
|
|
if err := api.RegisterEndpoint(api.Endpoint{
|
|
Path: "intel/geoip/countries",
|
|
Read: api.PermitUser,
|
|
// Do not attach to module, as the data is always available anyway.
|
|
StructFunc: func(ar *api.Request) (i interface{}, err error) {
|
|
return countries, nil
|
|
},
|
|
Name: "Get Country Information",
|
|
Description: "Returns a map of country information centers indexed by ISO-A2 country code",
|
|
}); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return module, nil
|
|
}
|
|
|
|
type instance interface {
|
|
Updates() *updates.Updates
|
|
}
|