Skip to content

[WIP] Miner support MQTT protocol #357

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

Open
laodouya wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

[WIP] Miner support MQTT protocol #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bb0466e
Add paho client, add broker config
Jun 14, 2019
eead3a7
Add a queue struct
Jun 14, 2019
a54f249
Add broker config.
Jun 17, 2019
ad2b6f2
Start mqtt client while miner started.
Jun 17, 2019
c25f630
Move mqtt client inside dbms.
Jun 17, 2019
a4cb2b8
Add write/newest api response.
Jun 18, 2019
58b2d49
Add log for mqtt client.
Jun 18, 2019
594a3ae
Add mqtt replay api.
Jun 18, 2019
a565d69
Refactor mqtt fetch block logic.
Jun 18, 2019
6976572
Fix mqtt miner did not use config.
Jun 18, 2019
e091f36
Upgrade payload struct, add type of value.
Jun 19, 2019
7608986
Read MQTT IoT client private key from config. Refuse request if not l…
Jun 19, 2019
c3bd201
Fix MQTT repeat send newest block
Jun 19, 2019
ee1f84c
Fix MQTT type convert bug.
Jun 19, 2019
fc33dce
Merge branch 'develop' into feature/miner_mqtt
Jun 21, 2019
ac8847d
Fix dbms shutdown bug while mqtt client is nil.
Jun 24, 2019
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
34 changes: 32 additions & 2 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 25 additions & 3 deletions conf/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"path"
"time"

yaml "gopkg.in/yaml.v2"
"gopkg.in/yaml.v2"

"github.com/CovenantSQL/CovenantSQL/crypto"
"github.com/CovenantSQL/CovenantSQL/crypto/asymmetric"
Expand Down Expand Up @@ -106,6 +106,14 @@ type DNSSeed struct {
BPCount int `yaml:"BPCount"`
}

type MQTTBrokerInfo struct {
Copy link
Copy Markdown

@covenantdb covenantdb Jun 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[golint] reported by reviewdog 🐶
exported type MQTTBrokerInfo should have comment or be unexported

Addr string `yaml:"Addr"`
//if no user, use ThisNodeID
User string `yaml:"User,omitempty"`
Password string `yaml:"Password"`
IoTKeyfilePath string `yaml:"IoTKeyfilePath"`
}

// Config holds all the config read from yaml config file.
type Config struct {
UseTestMasterKey bool `yaml:"UseTestMasterKey,omitempty"` // when UseTestMasterKey use default empty masterKey
Expand All @@ -129,8 +137,9 @@ type Config struct {

DNSSeed DNSSeed `yaml:"DNSSeed"`

BP *BPInfo `yaml:"BlockProducer"`
Miner *MinerInfo `yaml:"Miner,omitempty"`
BP *BPInfo `yaml:"BlockProducer"`
Miner *MinerInfo `yaml:"Miner,omitempty"`
MQTTBroker *MQTTBrokerInfo `yaml:"MQTTBroker,omitempty"`

KnownNodes []proto.Node `yaml:"KnownNodes"`
SeedBPNodes []proto.Node `yaml:"-"`
Expand Down Expand Up @@ -182,6 +191,15 @@ func LoadConfig(configPath string) (config *Config, err error) {
config.DHTFileName = "dht.db"
}

if config.MQTTBroker != nil {
if config.MQTTBroker.User == "" {
config.MQTTBroker.User = string(config.ThisNodeID)
}
if config.MQTTBroker.IoTKeyfilePath == "" {
config.MQTTBroker.IoTKeyfilePath = "iot_private"
}
}

configDir := path.Dir(configPath)
if !path.IsAbs(config.PubKeyStoreFile) {
config.PubKeyStoreFile = path.Join(configDir, config.PubKeyStoreFile)
Expand All @@ -207,6 +225,10 @@ func LoadConfig(configPath string) (config *Config, err error) {
config.Miner.RootDir = path.Join(configDir, config.Miner.RootDir)
}

if config.MQTTBroker != nil && !path.IsAbs(config.MQTTBroker.IoTKeyfilePath) {
config.MQTTBroker.IoTKeyfilePath = path.Join(configDir, config.MQTTBroker.IoTKeyfilePath)
}

if len(config.KnownNodes) > 0 {
for _, node := range config.KnownNodes {
if node.ID == config.ThisNodeID {
Expand Down
4 changes: 4 additions & 0 deletions sqlchain/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,6 +1020,10 @@ func (c *Chain) AddResponse(resp *types.SignedResponseHeader) (err error) {
return c.ai.addResponse(c.rt.getHeightFromTime(resp.GetRequestTimestamp()), resp)
}

func (c *Chain) GetPeerLeaderID() proto.NodeID {
Copy link
Copy Markdown

@covenantdb covenantdb Jun 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[golint] reported by reviewdog 🐶
exported method Chain.GetPeerLeaderID should have comment or be unexported

return c.rt.peers.Leader
}

func (c *Chain) register(ack *types.SignedAckHeader) (err error) {
return c.ai.register(c.rt.getHeightFromTime(ack.GetRequestTimestamp()), ack)
}
Expand Down
31 changes: 31 additions & 0 deletions test/service/mqtt_broker/acl_file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This affects access control for clients with no username.
#topic read $SYS/#

# This only affects clients with username "roger".
#user roger
#topic foo/bar
user 000005aa62048f85da4ae9698ed59c14ec0d48a88a07c15a32265634e7e64ade
topic readwrite /cql/miner/000005aa62048f85da4ae9698ed59c14ec0d48a88a07c15a32265634e7e64ade/#
topic read /cql/client/#

user 000005f4f22c06f76c43c4f48d5a7ec1309cc94030cbf9ebae814172884ac8b5
topic readwrite /cql/miner/000005f4f22c06f76c43c4f48d5a7ec1309cc94030cbf9ebae814172884ac8b5/#
topic read /cql/client/#

user 000003f49592f83d0473bddb70d543f1096b4ffed5e5f942a3117e256b7052b8
topic readwrite /cql/miner/000003f49592f83d0473bddb70d543f1096b4ffed5e5f942a3117e256b7052b8/#
topic read /cql/client/#

user client_test
topic readwrite /cql/client/client_test/#
topic readwrite /cql/client/client_test2/#
topic read /cql/miner/#

user client_test2
topic readwrite /cql/client/client_test2/#
topic read /cql/miner/#


# This affects all clients.
# pattern write $SYS/broker/connection/%c/state

Loading