Skip to content

Commit

Permalink
Renamed project
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Apr 17, 2020
1 parent a6fa3ba commit fd83f9b
Show file tree
Hide file tree
Showing 192 changed files with 1,389 additions and 1,389 deletions.
4 changes: 2 additions & 2 deletions .github/FUNDING.yml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github: ortuman
patreon: ortuman
github: sxmpp
patreon: sxmpp
2 changes: 1 addition & 1 deletion CONTRIBUTORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

# Please keep the list sorted.

Miguel Ángel Ortuño <ortuman@pm.me>
Miguel Ángel Ortuño <sxmpp@pm.me>
Robert Nasiadek <robert.nasiadek@pm.me>
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GOLDFLAGS =-s -w -extldflags $(LDFLAGS)

.PHONY: install
install:
@go install -ldflags="-s -w" github.com/ortuman/jackal
@go install -ldflags="-s -w" github.com/sxmpp/jackal

.PHONY: install-tools
install-tools:
Expand Down Expand Up @@ -60,7 +60,7 @@ dockerimage:
@echo "Building binary..."
@env GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w"
@echo "Building docker image..."
@docker build -f dockerfiles/Dockerfile -t ortuman/jackal .
@docker build -f dockerfiles/Dockerfile -t sxmpp/jackal .

.PHONY: clean
clean:
Expand Down
34 changes: 17 additions & 17 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

An XMPP server written in Go.

[![Build Status](https://travis-ci.org/ortuman/jackal.svg?branch=master)](https://travis-ci.org/ortuman/jackal)
[![GoDoc](https://godoc.org/github.com/ortuman/jackal?status.svg)](https://godoc.org/github.com/ortuman/jackal)
[![Test Coverage](https://api.codeclimate.com/v1/badges/e3bcd6e00a2f4493e175/test_coverage)](https://codeclimate.com/github/ortuman/jackal/test_coverage)
[![Maintainability](https://api.codeclimate.com/v1/badges/e3bcd6e00a2f4493e175/maintainability)](https://codeclimate.com/github/ortuman/jackal/maintainability)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/8e1575d0e64141a8bd4f8656e44052e6)](https://www.codacy.com/app/ortuman/jackal?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ortuman/jackal&amp;utm_campaign=Badge_Grade)
[![Go Report Card](https://goreportcard.com/badge/github.com/ortuman/jackal)](https://goreportcard.com/report/github.com/ortuman/jackal)
[![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://github.com/ortuman/jackal/blob/master/LICENSE)
[![Docker Pulls](https://img.shields.io/docker/pulls/ortuman/jackal.svg)](https://hub.docker.com/r/ortuman/jackal/)
[![Build Status](https://travis-ci.org/sxmpp/jackal.svg?branch=master)](https://travis-ci.org/sxmpp/jackal)
[![GoDoc](https://godoc.org/github.com/sxmpp/jackal?status.svg)](https://godoc.org/github.com/sxmpp/jackal)
[![Test Coverage](https://api.codeclimate.com/v1/badges/e3bcd6e00a2f4493e175/test_coverage)](https://codeclimate.com/github/sxmpp/jackal/test_coverage)
[![Maintainability](https://api.codeclimate.com/v1/badges/e3bcd6e00a2f4493e175/maintainability)](https://codeclimate.com/github/sxmpp/jackal/maintainability)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/8e1575d0e64141a8bd4f8656e44052e6)](https://www.codacy.com/app/sxmpp/jackal?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=sxmpp/jackal&amp;utm_campaign=Badge_Grade)
[![Go Report Card](https://goreportcard.com/badge/github.com/sxmpp/jackal)](https://goreportcard.com/report/github.com/sxmpp/jackal)
[![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://github.com/sxmpp/jackal/blob/master/LICENSE)
[![Docker Pulls](https://img.shields.io/docker/pulls/sxmpp/jackal.svg)](https://hub.docker.com/r/sxmpp/jackal/)
[![Join the chat at https://gitter.im/jackal-im/jackal](https://badges.gitter.im/jackal-im/jackal.svg)](https://gitter.im/jackal-im/jackal?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

<div align="center">
Expand Down Expand Up @@ -39,8 +39,8 @@ jackal supports the following features:
To start using jackal, install Go 1.13+ and run the following commands:

```bash
$ go get -d github.com/ortuman/jackal
$ cd $GOPATH/src/github.com/ortuman/jackal
$ go get -d github.com/sxmpp/jackal
$ cd $GOPATH/src/github.com/sxmpp/jackal
$ make install
```

Expand All @@ -49,7 +49,7 @@ This will retrieve the code and install the `jackal` server application into you
By default the application will try to read server configuration from `/etc/jackal/jackal.yml` file, but alternatively you can specify a custom configuration path from command line.

```sh
$ jackal --config=$GOPATH/src/github.com/ortuman/jackal/example.jackal.yml
$ jackal --config=$GOPATH/src/github.com/sxmpp/jackal/example.jackal.yml
```

### MySQL database creation
Expand All @@ -70,7 +70,7 @@ echo "CREATE DATABASE jackal;" | mysql -h localhost -u jackal -p
Download lastest version of the [MySQL schema](sql/mysql.up.sql) from jackal Github repository.

```sh
wget https://raw.githubusercontent.com/ortuman/jackal/master/sql/mysql.up.sql
wget https://raw.githubusercontent.com/sxmpp/jackal/master/sql/mysql.up.sql
```

Load database schema into the database.
Expand Down Expand Up @@ -130,11 +130,11 @@ Each time a message is sent to an offline user a `POST` http request to the `pas

## Run jackal in Docker

Set up `jackal` in the cloud in under 5 minutes with zero knowledge of Golang or Linux shell using our [jackal Docker image](https://hub.docker.com/r/ortuman/jackal/).
Set up `jackal` in the cloud in under 5 minutes with zero knowledge of Golang or Linux shell using our [jackal Docker image](https://hub.docker.com/r/sxmpp/jackal/).

```bash
$ docker pull ortuman/jackal
$ docker run --name jackal -p 5222:5222 ortuman/jackal
$ docker pull sxmpp/jackal
$ docker run --name jackal -p 5222:5222 sxmpp/jackal
```

## Supported Specifications
Expand Down Expand Up @@ -169,11 +169,11 @@ Help us keep jackal open and inclusive. Please read and follow our [Code of Cond
## Licensing

jackal is licensed under the GNU General Public License, Version 3.0. See
[LICENSE](https://github.com/ortuman/jackal/blob/master/LICENSE) for the full
[LICENSE](https://github.com/sxmpp/jackal/blob/master/LICENSE) for the full
license text.

## Contact

If you have any suggestion or question:

Miguel Ángel Ortuño, JID: ortuman@jackal.im, email: <ortuman@pm.me>
Miguel Ángel Ortuño, JID: sxmpp@jackal.im, email: <sxmpp@pm.me>
22 changes: 11 additions & 11 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ import (
"time"

"github.com/google/uuid"
"github.com/ortuman/jackal/c2s"
c2srouter "github.com/ortuman/jackal/c2s/router"
"github.com/ortuman/jackal/component"
"github.com/ortuman/jackal/log"
"github.com/ortuman/jackal/module"
"github.com/ortuman/jackal/router"
"github.com/ortuman/jackal/router/host"
"github.com/ortuman/jackal/s2s"
s2srouter "github.com/ortuman/jackal/s2s/router"
"github.com/ortuman/jackal/storage"
"github.com/ortuman/jackal/version"
"github.com/sxmpp/jackal/c2s"
c2srouter "github.com/sxmpp/jackal/c2s/router"
"github.com/sxmpp/jackal/component"
"github.com/sxmpp/jackal/log"
"github.com/sxmpp/jackal/module"
"github.com/sxmpp/jackal/router"
"github.com/sxmpp/jackal/router/host"
"github.com/sxmpp/jackal/s2s"
s2srouter "github.com/sxmpp/jackal/s2s/router"
"github.com/sxmpp/jackal/storage"
"github.com/sxmpp/jackal/version"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion app/app_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"testing"
"time"

"github.com/ortuman/jackal/version"
"github.com/sxmpp/jackal/version"
"github.com/stretchr/testify/require"
)

Expand Down
12 changes: 6 additions & 6 deletions app/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"bytes"
"io/ioutil"

"github.com/ortuman/jackal/c2s"
"github.com/ortuman/jackal/component"
"github.com/ortuman/jackal/module"
"github.com/ortuman/jackal/router/host"
"github.com/ortuman/jackal/s2s"
"github.com/ortuman/jackal/storage"
"github.com/sxmpp/jackal/c2s"
"github.com/sxmpp/jackal/component"
"github.com/sxmpp/jackal/module"
"github.com/sxmpp/jackal/router/host"
"github.com/sxmpp/jackal/s2s"
"github.com/sxmpp/jackal/storage"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion auth/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package auth
import (
"context"

"github.com/ortuman/jackal/xmpp"
"github.com/sxmpp/jackal/xmpp"
)

const saslNamespace = "urn:ietf:params:xml:ns:xmpp-sasl"
Expand Down
8 changes: 4 additions & 4 deletions auth/auth_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"testing"

"github.com/google/uuid"
"github.com/ortuman/jackal/model"
memorystorage "github.com/ortuman/jackal/storage/memory"
"github.com/ortuman/jackal/stream"
"github.com/ortuman/jackal/xmpp/jid"
"github.com/sxmpp/jackal/model"
memorystorage "github.com/sxmpp/jackal/storage/memory"
"github.com/sxmpp/jackal/stream"
"github.com/sxmpp/jackal/xmpp/jid"
"github.com/stretchr/testify/require"
)

Expand Down
6 changes: 3 additions & 3 deletions auth/plain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"context"
"encoding/base64"

"github.com/ortuman/jackal/storage/repository"
"github.com/ortuman/jackal/stream"
"github.com/ortuman/jackal/xmpp"
"github.com/sxmpp/jackal/storage/repository"
"github.com/sxmpp/jackal/stream"
"github.com/sxmpp/jackal/xmpp"
)

// Plain represents a PLAIN authenticator.
Expand Down
8 changes: 4 additions & 4 deletions auth/plain_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"encoding/base64"
"testing"

"github.com/ortuman/jackal/model"
memorystorage "github.com/ortuman/jackal/storage/memory"
"github.com/ortuman/jackal/xmpp"
"github.com/sxmpp/jackal/model"
memorystorage "github.com/sxmpp/jackal/storage/memory"
"github.com/sxmpp/jackal/xmpp"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -80,7 +80,7 @@ func TestAuthPlainAuthentication(t *testing.T) {
// invalid user
buf.Reset()
buf.WriteByte(0)
buf.WriteString("ortuman")
buf.WriteString("sxmpp")
buf.WriteByte(0)
buf.WriteString("1234")
elem.SetText(base64.StdEncoding.EncodeToString(buf.Bytes()))
Expand Down
12 changes: 6 additions & 6 deletions auth/scram.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import (
"strings"

"github.com/google/uuid"
"github.com/ortuman/jackal/model"
"github.com/ortuman/jackal/storage/repository"
"github.com/ortuman/jackal/stream"
"github.com/ortuman/jackal/transport"
utilstring "github.com/ortuman/jackal/util/string"
"github.com/ortuman/jackal/xmpp"
"github.com/sxmpp/jackal/model"
"github.com/sxmpp/jackal/storage/repository"
"github.com/sxmpp/jackal/stream"
"github.com/sxmpp/jackal/transport"
utilstring "github.com/sxmpp/jackal/util/string"
"github.com/sxmpp/jackal/xmpp"
"golang.org/x/crypto/pbkdf2"
)

Expand Down
34 changes: 17 additions & 17 deletions auth/scram_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"testing"
"time"

"github.com/ortuman/jackal/model"
"github.com/ortuman/jackal/transport"
"github.com/ortuman/jackal/transport/compress"
utilstring "github.com/ortuman/jackal/util/string"
"github.com/ortuman/jackal/xmpp"
"github.com/sxmpp/jackal/model"
"github.com/sxmpp/jackal/transport"
"github.com/sxmpp/jackal/transport/compress"
utilstring "github.com/sxmpp/jackal/util/string"
"github.com/sxmpp/jackal/xmpp"
"github.com/stretchr/testify/require"
"golang.org/x/crypto/pbkdf2"
)
Expand Down Expand Up @@ -85,7 +85,7 @@ var tt = []scramAuthTestCase{
scramType: ScramSHA1,
usesCb: false,
gs2BindFlag: "n",
n: "ortuman",
n: "sxmpp",
r: "bb769406-eaa4-4f38-a279-2b90e596f6dd",
password: "1234",
},
Expand All @@ -95,7 +95,7 @@ var tt = []scramAuthTestCase{
scramType: ScramSHA256,
usesCb: false,
gs2BindFlag: "n",
n: "ortuman",
n: "sxmpp",
r: "6d805d99-6dc3-4e5a-9a68-653856fc5129",
password: "1234",
},
Expand All @@ -107,7 +107,7 @@ var tt = []scramAuthTestCase{
cbBytes: randomBytes(23),
gs2BindFlag: "p=tls-unique",
authID: "a=jackal.im",
n: "ortuman",
n: "sxmpp",
r: "7e51aff7-6875-4dce-820a-6d4970635006",
password: "1234",
},
Expand All @@ -119,7 +119,7 @@ var tt = []scramAuthTestCase{
cbBytes: randomBytes(32),
gs2BindFlag: "p=tls-unique",
authID: "a=jackal.im",
n: "ortuman",
n: "sxmpp",
r: "d712875c-bd3b-4b41-801d-eb9c541d9884",
password: "1234",
},
Expand All @@ -142,7 +142,7 @@ var tt = []scramAuthTestCase{
scramType: ScramSHA1,
usesCb: false,
gs2BindFlag: "n",
n: "ortuman",
n: "sxmpp",
r: "bb769406-eaa4-4f38-a279-2b90e596f6dd",
password: "12345678",
expectedErr: ErrSASLNotAuthorized,
Expand All @@ -153,7 +153,7 @@ var tt = []scramAuthTestCase{
scramType: ScramSHA1,
usesCb: false,
gs2BindFlag: "y",
n: "ortuman",
n: "sxmpp",
r: "bb769406-eaa4-4f38-a279-2b90e596f6dd",
password: "1234",
expectedErr: ErrSASLNotAuthorized,
Expand All @@ -165,7 +165,7 @@ var tt = []scramAuthTestCase{
usesCb: false,
gs2BindFlag: "n",
authID: "b=jackal.im",
n: "ortuman",
n: "sxmpp",
r: "bb769406-eaa4-4f38-a279-2b90e596f6dd",
password: "1234",
expectedErr: ErrSASLMalformedRequest,
Expand All @@ -177,7 +177,7 @@ var tt = []scramAuthTestCase{
usesCb: false,
gs2BindFlag: "p=tls-unique",
authID: "a=jackal.im",
n: "ortuman",
n: "sxmpp",
r: "bb769406-eaa4-4f38-a279-2b90e596f6dd",
password: "1234",
expectedErr: ErrSASLNotAuthorized,
Expand All @@ -189,7 +189,7 @@ var tt = []scramAuthTestCase{
usesCb: false,
gs2BindFlag: "q=tls-unique",
authID: "a=jackal.im",
n: "ortuman",
n: "sxmpp",
r: "bb769406-eaa4-4f38-a279-2b90e596f6dd",
password: "1234",
expectedErr: ErrSASLMalformedRequest,
Expand All @@ -210,7 +210,7 @@ var tt = []scramAuthTestCase{

func TestScramMechanisms(t *testing.T) {
testTr := &fakeTransport{}
testStm, s := authTestSetup(&model.User{Username: "ortuman", Password: "1234"})
testStm, s := authTestSetup(&model.User{Username: "sxmpp", Password: "1234"})

authr := NewScram(testStm, testTr, ScramSHA1, false, s)
require.Equal(t, authr.Mechanism(), "SCRAM-SHA-1")
Expand All @@ -234,7 +234,7 @@ func TestScramMechanisms(t *testing.T) {

func TestScramBadPayload(t *testing.T) {
testTr := &fakeTransport{}
testStm, s := authTestSetup(&model.User{Username: "ortuman", Password: "1234"})
testStm, s := authTestSetup(&model.User{Username: "sxmpp", Password: "1234"})

authr := NewScram(testStm, testTr, ScramSHA1, false, s)

Expand Down Expand Up @@ -265,7 +265,7 @@ func processScramTestCase(t *testing.T, tc *scramAuthTestCase) error {
if tc.usesCb {
tr.cbBytes = tc.cbBytes
}
testStm, s := authTestSetup(&model.User{Username: "ortuman", Password: "1234"})
testStm, s := authTestSetup(&model.User{Username: "sxmpp", Password: "1234"})

authr := NewScram(testStm, tr, tc.scramType, tc.usesCb, s)

Expand Down
10 changes: 5 additions & 5 deletions c2s/c2s.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"sync"
"sync/atomic"

"github.com/ortuman/jackal/component"
"github.com/ortuman/jackal/log"
"github.com/ortuman/jackal/module"
"github.com/ortuman/jackal/router"
"github.com/ortuman/jackal/storage/repository"
"github.com/sxmpp/jackal/component"
"github.com/sxmpp/jackal/log"
"github.com/sxmpp/jackal/module"
"github.com/sxmpp/jackal/router"
"github.com/sxmpp/jackal/storage/repository"
"github.com/pkg/errors"
)

Expand Down
Loading

0 comments on commit fd83f9b

Please sign in to comment.