Skip to content

Commit d894153

Browse files
committed
Implemented XMPP federation.
1 parent cf281b8 commit d894153

File tree

131 files changed

+7655
-4485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+7655
-4485
lines changed

Gopkg.lock

Lines changed: 28 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ $ docker run --name jackal -p 5222:5222 ortuman/jackal
100100
- [XEP-0160: Best Practices for Handling Offline Messages](https://xmpp.org/extensions/xep-0160.html)
101101
- [XEP-0191: Blocking Command](https://xmpp.org/extensions/xep-0191.html)
102102
- [XEP-0199: XMPP Ping](https://xmpp.org/extensions/xep-0199.html)
103+
- [XEP-0220: Server Dialback](https://xmpp.org/extensions/xep-0220.html)
103104
- [XEP-0237: Roster Versioning](https://xmpp.org/extensions/xep-0237.html)
104105

105106
## Join and Contribute

auth/auth_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ package auth
88
import (
99
"testing"
1010

11+
"github.com/ortuman/jackal/model"
1112
"github.com/ortuman/jackal/storage"
12-
"github.com/ortuman/jackal/storage/model"
1313
"github.com/ortuman/jackal/stream"
14-
"github.com/ortuman/jackal/xml"
14+
"github.com/ortuman/jackal/xml/jid"
1515
"github.com/pborman/uuid"
1616
"github.com/stretchr/testify/require"
1717
)
@@ -21,14 +21,14 @@ func authTestSetup(user *model.User) *stream.MockC2S {
2121

2222
storage.Instance().InsertOrUpdateUser(user)
2323

24-
jid, _ := xml.NewJID("mariana", "localhost", "res", true)
24+
j, _ := jid.New("mariana", "localhost", "res", true)
2525

26-
testStrm := stream.NewMockC2S(uuid.New(), jid)
26+
testStrm := stream.NewMockC2S(uuid.New(), j)
2727
testStrm.SetUsername("mariana")
2828
testStrm.SetDomain("localhost")
2929
testStrm.SetResource("res")
3030

31-
testStrm.SetJID(jid)
31+
testStrm.SetJID(j)
3232
return testStrm
3333
}
3434

auth/digest_md5.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"fmt"
1414
"strings"
1515

16+
"github.com/ortuman/jackal/model"
1617
"github.com/ortuman/jackal/storage"
17-
"github.com/ortuman/jackal/storage/model"
1818
"github.com/ortuman/jackal/stream"
1919
"github.com/ortuman/jackal/util"
2020
"github.com/ortuman/jackal/xml"

auth/digest_md5_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"fmt"
1212
"testing"
1313

14+
"github.com/ortuman/jackal/model"
1415
"github.com/ortuman/jackal/storage"
1516
"github.com/ortuman/jackal/storage/memstorage"
16-
"github.com/ortuman/jackal/storage/model"
1717
"github.com/ortuman/jackal/stream"
1818
"github.com/ortuman/jackal/util"
1919
"github.com/ortuman/jackal/xml"

auth/plain_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"encoding/base64"
1111
"testing"
1212

13+
"github.com/ortuman/jackal/model"
1314
"github.com/ortuman/jackal/storage"
1415
"github.com/ortuman/jackal/storage/memstorage"
15-
"github.com/ortuman/jackal/storage/model"
1616
"github.com/ortuman/jackal/xml"
1717
"github.com/stretchr/testify/require"
1818
)

auth/scram.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"hash"
1616
"strings"
1717

18+
"github.com/ortuman/jackal/model"
1819
"github.com/ortuman/jackal/storage"
19-
"github.com/ortuman/jackal/storage/model"
2020
"github.com/ortuman/jackal/stream"
2121
"github.com/ortuman/jackal/transport"
2222
"github.com/ortuman/jackal/util"

auth/scram_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import (
1111
"crypto/sha1"
1212
"crypto/sha256"
1313
"crypto/tls"
14+
"crypto/x509"
1415
"encoding/base64"
1516
"fmt"
1617
"hash"
1718
"strconv"
1819
"strings"
1920
"testing"
2021

21-
"github.com/ortuman/jackal/storage/model"
22+
"github.com/ortuman/jackal/model"
2223
"github.com/ortuman/jackal/transport"
2324
"github.com/ortuman/jackal/transport/compress"
2425
"github.com/ortuman/jackal/util"
@@ -41,6 +42,7 @@ func (ft *fakeTransport) EnableCompression(compress.Level) { return }
4142
func (ft *fakeTransport) ChannelBindingBytes(transport.ChannelBindingMechanism) []byte {
4243
return ft.cbBytes
4344
}
45+
func (ft *fakeTransport) PeerCertificates() []*x509.Certificate { return nil }
4446

4547
type scramAuthTestCase struct {
4648
id int

0 commit comments

Comments
 (0)