forked from cwtch.im/cwtch
Merge pull request 'API for Block/Allow Unknown Connections' (#343) from blockunknown into master
Reviewed-on: cwtch.im/cwtch#343
This commit is contained in:
commit
a6327c1b6d
|
@ -43,6 +43,17 @@ type cwtchPeer struct {
|
|||
eventBus event.Manager
|
||||
}
|
||||
|
||||
// BlockUnknownConnections will auto disconnect from connections if authentication doesn't resolve a hostname
|
||||
// known to peer.
|
||||
func (cp *cwtchPeer) BlockUnknownConnections() {
|
||||
cp.eventBus.Publish(event.NewEvent(event.BlockUnknownPeers, map[event.Field]string{}))
|
||||
}
|
||||
|
||||
// AllowUnknownConnections will permit connections from unknown contacts.
|
||||
func (cp *cwtchPeer) AllowUnknownConnections() {
|
||||
cp.eventBus.Publish(event.NewEvent(event.AllowUnknownPeers, map[event.Field]string{}))
|
||||
}
|
||||
|
||||
// ReadContacts is a meta-interface intended to restrict callers to read-only access to contacts
|
||||
type ReadContacts interface {
|
||||
GetContacts() []string
|
||||
|
@ -65,6 +76,8 @@ type AccessPeeringState interface {
|
|||
|
||||
// ModifyPeeringState is a meta-interface intended to restrict callers to modify-only access to connection peers
|
||||
type ModifyPeeringState interface {
|
||||
BlockUnknownConnections()
|
||||
AllowUnknownConnections()
|
||||
PeerWithOnion(string)
|
||||
JoinServer(string) error
|
||||
}
|
||||
|
|
|
@ -144,9 +144,9 @@ func (e *engine) eventHandler() {
|
|||
case event.DeleteGroup:
|
||||
// TODO: There isn't a way here to determine if other Groups are using a server connection...
|
||||
case event.SendMessageToGroup:
|
||||
ciphertext,_ := base64.StdEncoding.DecodeString(ev.Data[event.Ciphertext])
|
||||
signature,_ := base64.StdEncoding.DecodeString(ev.Data[event.Signature])
|
||||
err := e.sendMessageToGroup(ev.Data[event.GroupServer],ciphertext, signature)
|
||||
ciphertext, _ := base64.StdEncoding.DecodeString(ev.Data[event.Ciphertext])
|
||||
signature, _ := base64.StdEncoding.DecodeString(ev.Data[event.Signature])
|
||||
err := e.sendMessageToGroup(ev.Data[event.GroupServer], ciphertext, signature)
|
||||
if err != nil {
|
||||
e.eventManager.Publish(event.NewEvent(event.SendMessageToGroupError, map[event.Field]string{event.GroupServer: ev.Data[event.GroupServer], event.EventID: ev.EventID, event.Error: err.Error()}))
|
||||
}
|
||||
|
@ -178,8 +178,10 @@ func (e *engine) eventHandler() {
|
|||
e.peerDisconnected(ev.Data[event.RemotePeer])
|
||||
}
|
||||
case event.AllowUnknownPeers:
|
||||
log.Debugf("%v now allows unknown connections", e.identity.Hostname())
|
||||
e.blockUnknownContacts = false
|
||||
case event.BlockUnknownPeers:
|
||||
log.Debugf("%v now forbids unknown connections", e.identity.Hostname())
|
||||
e.blockUnknownContacts = true
|
||||
case event.ProtocolEngineStartListen:
|
||||
go e.listenFn()
|
||||
|
|
Loading…
Reference in New Issue