Skip to content

Commit

Permalink
Moved to FIDO Alliance
Browse files Browse the repository at this point in the history
  • Loading branch information
yackermann committed Feb 28, 2023
1 parent 1281ebe commit 9f38caf
Show file tree
Hide file tree
Showing 41 changed files with 190 additions and 191 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ build_frontend:
# Build frontend
update_fdo_packages:
echo "\n----- Updating FDO packages... -----\n"
GOSUMDB=off go get github.com/WebauthnWorks/fdo-shared
GOSUMDB=off go get github.com/WebauthnWorks/fdo-do
GOSUMDB=off go get github.com/WebauthnWorks/fdo-rv
GOSUMDB=off go get github.com/WebauthnWorks/fdo-device-implementation
GOSUMDB=off go get github.com/fido-alliance/fdo-shared
GOSUMDB=off go get github.com/fido-alliance/fdo-do
GOSUMDB=off go get github.com/fido-alliance/fdo-rv
GOSUMDB=off go get github.com/fido-alliance/fdo-device-implementation


# Build frontend
Expand All @@ -74,7 +74,7 @@ fdotools__restart_docker_compose:
echo "\n----- Restarting docker compose... -----\n"
ssh ${FDO_BUILD_PUSH_HOST} "cd $(fdotools_infra_loc) && docker-compose up --build --force -d"

fdotools__restart_docker_update:
# fdotools__restart_docker_update:


build: build_frontend compile_all
23 changes: 11 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ FIDO Device Onboarding Conformance Server
FDO conformance tools are build in Golang for the backend, and Svelte NodeJS frontend framework for the frontend. Uses on disk key-value DB, so you do not need SQL or Mongo to run it.

The backend consists of five modules:
- [FDO: Shared](https://github.com/WebauthnWorks/fdo-shared) - a common module for all FDO operations that has all the crypto, structs definitions, and registry for commands, codes, and algorithms.
- [FDO: Shared](https://github.com/fido-alliance/fdo-shared) - a common module for all FDO operations that has all the crypto, structs definitions, and registry for commands, codes, and algorithms.

- [FDO: DO Service](https://github.com/WebauthnWorks/fdo-do) - Device Onboarding Service with full implementation of FDO DO TO0 and TO2 protocols. It also contains all related tests.
- [FDO: RV Service](https://github.com/WebauthnWorks/fdo-rv) - Rendezvous Service with full implementation of FDO DO TO0 and TO1 protocols. It also contains all related tests.
- [FDO: Device Implementation Service](https://github.com/WebauthnWorks/fdo-device-implementation) - Virtual Device Implementation with full implementation of FDO DO TO1 and TO2 protocols. It also contains all related tests.
- [FDO: DO Service](https://github.com/fido-alliance/fdo-do) - Device Onboarding Service with full implementation of FDO DO TO0 and TO2 protocols. It also contains all related tests.
- [FDO: RV Service](https://github.com/fido-alliance/fdo-rv) - Rendezvous Service with full implementation of FDO DO TO0 and TO1 protocols. It also contains all related tests.
- [FDO: Device Implementation Service](https://github.com/fido-alliance/fdo-device-implementation) - Virtual Device Implementation with full implementation of FDO DO TO1 and TO2 protocols. It also contains all related tests.

- [FIDO Conformance Server](https://github.com/WebauthnWorks/fdo-fido-conformance-server) - A user facing conformance server. Has testing structs, conformance APIs, conformance tests ID and much much more.
- [FIDO Conformance Server - Frontend](https://github.com/WebauthnWorks/fdo-fido-conformance-frontend) - A frontend for FIDO Conformance Server
- [FIDO Conformance Server](https://github.com/fido-alliance/fdo-fido-conformance-server) - A user facing conformance server. Has testing structs, conformance APIs, conformance tests ID and much much more.
- [FIDO Conformance Server - Frontend](https://github.com/fido-alliance/fdo-fido-conformance-frontend) - A frontend for FIDO Conformance Server

## Pre requisites:
- Node JS 16+ https://nodejs.org/en/
Expand Down Expand Up @@ -57,7 +57,7 @@ The backend consists of five modules:

To update packages without GOSUM check use env `GOSUMDB=off`

* Example `GOSUMDB=off go get github.com/WebauthnWorks/fdo-device-implementation`
* Example `GOSUMDB=off go get github.com/fido-alliance/fdo-device-implementation`
* To update all `make update_fdo_packages`

### Structure
Expand All @@ -71,9 +71,8 @@ To update packages without GOSUM check use env `GOSUMDB=off`

- `testexec` - Contains TO0 DO, TO1 Device, TO2 Device conformance testing execution.

- [FDO: Shared /testcom/](https://github.com/WebauthnWorks/fdo-shared/testcom/) - Contains common test methods, dbs, etc
- [FDO: Shared /testcom/listener](https://github.com/WebauthnWorks/fdo-shared/testcom/listener) - Contains all listener tests dependencies for `RV(TO0)`, `RV(TO1)`, and `DO(TO2)`
- [FDO: Shared /testcom/request](https://github.com/WebauthnWorks/fdo-shared/testcom/request) - Contains all requestor tests dependencies for `DO(TO0)`, `Device(TO1)`, `Device(TO2)`

- `/frontend` - Contains frontend git submodule. See https://github.com/WebauthnWorks/fdo-fido-conformance-frontend
- [FDO: Shared /testcom/](https://github.com/fido-alliance/fdo-shared/testcom/) - Contains common test methods, dbs, etc
- [FDO: Shared /testcom/listener](https://github.com/fido-alliance/fdo-shared/testcom/listener) - Contains all listener tests dependencies for `RV(TO0)`, `RV(TO1)`, and `DO(TO2)`
- [FDO: Shared /testcom/request](https://github.com/fido-alliance/fdo-shared/testcom/request) - Contains all requestor tests dependencies for `DO(TO0)`, `Device(TO1)`, `Device(TO2)`

- `/frontend` - Contains frontend git submodule. See https://github.com/fido-alliance/fdo-fido-conformance-frontend
8 changes: 4 additions & 4 deletions api/admin.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"log"
"net/http"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/services"
fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/services"
fdoshared "github.com/fido-alliance/fdo-shared"
)

type AdminApi struct {
Expand Down
6 changes: 3 additions & 3 deletions api/buildsproxy.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"net/url"
"strings"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
fdoshared "github.com/fido-alliance/fdo-shared"
)

type BuildsProxyAPI struct {
Expand Down
2 changes: 1 addition & 1 deletion api/commonapi/user.struct.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commonapi

import fdoshared "github.com/WebauthnWorks/fdo-shared"
import fdoshared "github.com/fido-alliance/fdo-shared"

type User_UserReq struct {
Name string `json:"name"`
Expand Down
2 changes: 1 addition & 1 deletion api/frontend.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http/httputil"
"net/url"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
)

func ProxyDevUI(w http.ResponseWriter, r *http.Request) {
Expand Down
8 changes: 4 additions & 4 deletions api/oauth2.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"net/http"
"strings"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/services"
fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/services"
fdoshared "github.com/fido-alliance/fdo-shared"
"github.com/gorilla/mux"
)

Expand Down
4 changes: 2 additions & 2 deletions api/results.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package api
import (
"net/http"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
)

type ResultsAPI struct {
Expand Down
12 changes: 6 additions & 6 deletions api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"net/http"

dodbs "github.com/WebauthnWorks/fdo-do/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/api/testapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/services"
"github.com/WebauthnWorks/fdo-fido-conformance-server/tools"
testdbs "github.com/WebauthnWorks/fdo-shared/testcom/dbs"
dodbs "github.com/fido-alliance/fdo-do/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/api/testapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/services"
"github.com/fido-alliance/fdo-fido-conformance-server/tools"
testdbs "github.com/fido-alliance/fdo-shared/testcom/dbs"

"github.com/dgraph-io/badger/v3"
"github.com/gorilla/mux"
Expand Down
18 changes: 9 additions & 9 deletions api/testapi/device.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import (
"net/http"
"strconv"

fdodocommon "github.com/WebauthnWorks/fdo-device-implementation/common"
dodbs "github.com/WebauthnWorks/fdo-do/dbs"
"github.com/WebauthnWorks/fdo-do/to0"
"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/WebauthnWorks/fdo-shared/testcom"
testcomdbs "github.com/WebauthnWorks/fdo-shared/testcom/dbs"
listenertestsdeps "github.com/WebauthnWorks/fdo-shared/testcom/listener"
fdodocommon "github.com/fido-alliance/fdo-device-implementation/common"
dodbs "github.com/fido-alliance/fdo-do/dbs"
"github.com/fido-alliance/fdo-do/to0"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
fdoshared "github.com/fido-alliance/fdo-shared"
"github.com/fido-alliance/fdo-shared/testcom"
testcomdbs "github.com/fido-alliance/fdo-shared/testcom/dbs"
listenertestsdeps "github.com/fido-alliance/fdo-shared/testcom/listener"

"github.com/gorilla/mux"
)
Expand Down
4 changes: 2 additions & 2 deletions api/testapi/device.structs.api.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package testapi

import (
"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
listenertestsdeps "github.com/WebauthnWorks/fdo-shared/testcom/listener"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
listenertestsdeps "github.com/fido-alliance/fdo-shared/testcom/listener"
)

type Device_CreateTestCase struct {
Expand Down
14 changes: 7 additions & 7 deletions api/testapi/do.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"net/http"
"net/url"

fdodeviceimplementation "github.com/WebauthnWorks/fdo-device-implementation"
"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/testexec"
fdoshared "github.com/WebauthnWorks/fdo-shared"
testdbs "github.com/WebauthnWorks/fdo-shared/testcom/dbs"
reqtestsdeps "github.com/WebauthnWorks/fdo-shared/testcom/request"
fdodeviceimplementation "github.com/fido-alliance/fdo-device-implementation"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/testexec"
fdoshared "github.com/fido-alliance/fdo-shared"
testdbs "github.com/fido-alliance/fdo-shared/testcom/dbs"
reqtestsdeps "github.com/fido-alliance/fdo-shared/testcom/request"
"github.com/gorilla/mux"
)

Expand Down
6 changes: 3 additions & 3 deletions api/testapi/do.structs.api.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package testapi

import (
"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
fdoshared "github.com/WebauthnWorks/fdo-shared"
reqtestsdeps "github.com/WebauthnWorks/fdo-shared/testcom/request"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
fdoshared "github.com/fido-alliance/fdo-shared"
reqtestsdeps "github.com/fido-alliance/fdo-shared/testcom/request"
)

type DOT_CreateTestCase struct {
Expand Down
12 changes: 6 additions & 6 deletions api/testapi/rv.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"net/http"
"net/url"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/testexec"
fdoshared "github.com/WebauthnWorks/fdo-shared"
testdbs "github.com/WebauthnWorks/fdo-shared/testcom/dbs"
reqtestsdeps "github.com/WebauthnWorks/fdo-shared/testcom/request"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/testexec"
fdoshared "github.com/fido-alliance/fdo-shared"
testdbs "github.com/fido-alliance/fdo-shared/testcom/dbs"
reqtestsdeps "github.com/fido-alliance/fdo-shared/testcom/request"
"github.com/gorilla/mux"
)

Expand Down
6 changes: 3 additions & 3 deletions api/testapi/rv.structs.api.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package testapi

import (
"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
fdoshared "github.com/WebauthnWorks/fdo-shared"
reqtestsdeps "github.com/WebauthnWorks/fdo-shared/testcom/request"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
fdoshared "github.com/fido-alliance/fdo-shared"
reqtestsdeps "github.com/fido-alliance/fdo-shared/testcom/request"
)

type RVT_CreateTestCase struct {
Expand Down
8 changes: 4 additions & 4 deletions api/user.auth.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/http"
"strings"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/services"
fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/services"
fdoshared "github.com/fido-alliance/fdo-shared"
)

func (h *UserAPI) Register(w http.ResponseWriter, r *http.Request) {
Expand Down
6 changes: 3 additions & 3 deletions api/user.common.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"net/http"
"regexp"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/services"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/services"
"golang.org/x/crypto/scrypt"
)

Expand Down
8 changes: 4 additions & 4 deletions api/user.other.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/http"
"strings"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/services"
fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/services"
fdoshared "github.com/fido-alliance/fdo-shared"
)

func (h *UserAPI) isLoggedIn(r *http.Request) (bool, *dbs.SessionEntry, *dbs.UserTestDBEntry) {
Expand Down
8 changes: 4 additions & 4 deletions api/user.verify.api.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"net/http"
"time"

"github.com/WebauthnWorks/fdo-fido-conformance-server/api/commonapi"
"github.com/WebauthnWorks/fdo-fido-conformance-server/dbs"
"github.com/WebauthnWorks/fdo-fido-conformance-server/services"
fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/fido-alliance/fdo-fido-conformance-server/api/commonapi"
"github.com/fido-alliance/fdo-fido-conformance-server/dbs"
"github.com/fido-alliance/fdo-fido-conformance-server/services"
fdoshared "github.com/fido-alliance/fdo-shared"
"github.com/gorilla/mux"
"golang.org/x/crypto/scrypt"
)
Expand Down
2 changes: 1 addition & 1 deletion dbs/config.db.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/dgraph-io/badger/v3"
fdoshared "github.com/fido-alliance/fdo-shared"
"github.com/fxamacker/cbor/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions dbs/devicebase.db.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"errors"
"fmt"

fdodeviceimplementation "github.com/WebauthnWorks/fdo-device-implementation"
fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/WebauthnWorks/fdo-shared/testcom"
"github.com/dgraph-io/badger/v3"
fdodeviceimplementation "github.com/fido-alliance/fdo-device-implementation"
fdoshared "github.com/fido-alliance/fdo-shared"
"github.com/fido-alliance/fdo-shared/testcom"
"github.com/fxamacker/cbor/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion dbs/user.structs.db.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package dbs
import (
"bytes"

fdoshared "github.com/WebauthnWorks/fdo-shared"
"github.com/dgraph-io/badger/v3"
fdoshared "github.com/fido-alliance/fdo-shared"
"github.com/google/uuid"
)

Expand Down
2 changes: 1 addition & 1 deletion frontend
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/WebauthnWorks/fdo-fido-conformance-server
module github.com/fido-alliance/fdo-fido-conformance-server

go 1.18

Expand All @@ -12,15 +12,15 @@ require (
)

require (
github.com/WebauthnWorks/fdo-device-implementation v0.3.1
github.com/WebauthnWorks/fdo-do v0.3.1
github.com/WebauthnWorks/fdo-rv v0.3.1
github.com/WebauthnWorks/fdo-shared v0.9.85
github.com/fido-alliance/fdo-device-implementation v0.3.1
github.com/fido-alliance/fdo-do v0.3.1
github.com/fido-alliance/fdo-rv v0.3.1
github.com/fido-alliance/fdo-shared v0.9.85
golang.org/x/oauth2 v0.3.0
)

require (
github.com/WebauthnWorks/dhkx v0.3.3 // indirect
github.com/fido-alliance/dhkx v0.3.3 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
Expand All @@ -46,7 +46,7 @@ require (
)

// For when you are doing local dev
// replace github.com/WebauthnWorks/fdo-do v0.0.0 => /Users/yuriy/go/src/github.com/WebauthnWorks/fdo-do
// replace github.com/WebauthnWorks/fdo-rv v0.0.0 => /Users/yuriy/go/src/github.com/WebauthnWorks/fdo-rv
// replace github.com/WebauthnWorks/fdo-device-implementation v0.0.0 => /Users/yuriy/go/src/github.com/WebauthnWorks/fdo-device-implementation
// replace github.com/WebauthnWorks/fdo-shared v0.0.0 => /Users/yuriy/go/src/github.com/WebauthnWorks/fdo-shared
// replace github.com/fido-alliance/fdo-do v0.0.0 => /Users/yuriy/go/src/github.com/fido-alliance/fdo-do
// replace github.com/fido-alliance/fdo-rv v0.0.0 => /Users/yuriy/go/src/github.com/fido-alliance/fdo-rv
// replace github.com/fido-alliance/fdo-device-implementation v0.0.0 => /Users/yuriy/go/src/github.com/fido-alliance/fdo-device-implementation
// replace github.com/fido-alliance/fdo-shared v0.0.0 => /Users/yuriy/go/src/github.com/fido-alliance/fdo-shared
Loading

0 comments on commit 9f38caf

Please sign in to comment.