all: fix integration tests

gortc · Jul 21, 2018 · 4e21873 · 4e21873
1 parent 4058ede
commit 4e21873
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/integration-test/gortcd.yml b/integration-test/gortcd.yml
@@ -0,0 +1,19 @@
+---
+version: "1.1"
+
+server:
+  check_fingerprint: true
+  listen:
+    - 0.0.0.0:3478
+  realm: realm
+
+auth:
+  public: false
+
+  nonce:
+    static: false
+    timeout: 600s
+
+  static:
+    - username: username
+      password: secret
diff --git a/integration-test/main.go b/integration-test/main.go
@@ -167,6 +167,9 @@ func main() {
 	if err := res.Parse(&nonce, &realm); err != nil {
 		logger.Fatal("failed to get nonce and realm")
 	}
+	logger.Info("integrity",
+		zap.Stringer("nonce", nonce), zap.Stringer("realm", realm), zap.String("password", password),
+	)
 	integrity := stun.NewLongTermIntegrity(username.String(), realm.String(), password)
 	// Constructing allocate request with integrity
 	if err := do(logger, req, res, c,

diff --git a/integration-test/server.Dockerfile b/integration-test/server.Dockerfile
@@ -8,5 +8,7 @@ WORKDIR /go/src/github.com/gortc/gortcd
 
 RUN go install .
 
+COPY integration-test/gortcd.yml .
+
 CMD ["gortcd"]
 
diff --git a/internal/commands/run.go b/internal/commands/run.go
@@ -49,7 +49,7 @@ func normalize(address string) string {
 
 type staticCredElem struct {
 	Username string `mapstructure:"username"`
-	Password string `mapstructure:"username"`
+	Password string `mapstructure:"password"`
 	Key      string `mapstructure:"key"`
 	Realm    string `mapstructure:"realm"`
 }

diff --git a/internal/server/integration_test.go b/internal/server/integration_test.go
@@ -20,8 +20,9 @@ func TestServerIntegration(t *testing.T) {
 		t.Fatal(err)
 	}
 	s, err := New(Options{
-		Log:  logger.Named("server"),
-		Conn: serverConn,
+		Log:   logger.Named("server"),
+		Conn:  serverConn,
+		Realm: "realm",
 		Auth: auth.NewStatic([]auth.StaticCredential{
 			{Username: "username", Password: "secret", Realm: "realm"},
 		}),

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -319,7 +319,6 @@ func (s *Server) needAuth(ctx *context) bool {
 }
 
 var (
-	realm        = stun.NewRealm("realm")
 	defaultNonce = stun.NewNonce("nonce")
 )
 
@@ -337,7 +336,7 @@ func (s *Server) process(ctx *context) error {
 		return nil
 	}
 	ctx.software = software
-	ctx.realm = realm
+	ctx.realm = s.realm
 	ctx.nonce = defaultNonce
 	if ce := s.log.Check(zapcore.InfoLevel, "got message"); ce != nil {
 		ce.Write(zap.Stringer("m", ctx.request), zap.Stringer("addr", ctx.client))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,5 +8,7 @@ WORKDIR /go/src/github.com/gortc/gortcd

		RUN go install .

		COPY integration-test/gortcd.yml .

		CMD ["gortcd"]