Skip to content

let apns support multi-cert #288

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
lbeeon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

let apns support multi-cert #288

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8fef04
let apns support multi-cert
lbeeon Sep 26, 2017
768bbf2
adjust config.yaml, fixed test.
lbeeon Sep 27, 2017
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
2 changes: 1 addition & 1 deletion config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ios:
production: false
max_retry: 0 # resend fail notification, default value zero is disabled
key_map:
cert1: "key.pem"
cert1: "cert1.pem"
cert2: "cert2.pem"
cert3: "cert3.pem"
key_password:
Expand Down
3 changes: 3 additions & 0 deletions gorush/notification_apns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ func InitAPNSClient(key string) (*apns.Client, error) {
LogError.Errorf("Key %s key_password not exist", key)
return nil, errors.New("APNS key_password not exists")
}
path = PushConf.Ios.KeyMap[key]
password = PushConf.Ios.KeyMap[key]
Copy link

@niveuseverto niveuseverto Feb 21, 2018

Choose a reason for hiding this comment

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

password = PushConf.Ios.KeyMap[key] needs to be changed to password = PushConf.Ios.KeyPass[key]

Copy link
Contributor

@slimus slimus Feb 25, 2020

Choose a reason for hiding this comment

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

KeyPass

} else {
path = PushConf.Ios.KeyPath
password = PushConf.Ios.Password
}

if c, ok := ApnsClients[path]; ok {
return c, nil
}
Expand Down
4 changes: 2 additions & 2 deletions gorush/notification_apns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ func TestProvideApnsClient(t *testing.T) {
PushConf = config.BuildDefaultPushConf()

PushConf.Ios.Enabled = true
PushConf.Ios.KeyPath = "../certificate/certificate-valid.pem"
// PushConf.Ios.KeyPath = "../certificate/certificate-valid.pem"
ApnsClients = make(map[string]*apns2.Client, len(PushConf.Ios.KeyMap))
PushConf.Ios.KeyMap = map[string]string{"cert1": "../certificate/certificate-valid.pem"}
PushConf.Ios.KeyPass = map[string]string{"cert1": ""}
Expand All @@ -453,7 +453,7 @@ func TestProvideApnsClient(t *testing.T) {
ApnsClient: "cert1",
}

// send fail
// send success
isError := PushToIOS(req)
assert.True(t, isError)
}
Expand Down