From 6269ac83d4b714a9e293c58bbe9e5783928698d4 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sun, 31 Oct 2021 16:43:43 +0100 Subject: [PATCH] Update go.mod --- checker/checker.go | 4 +-- checker/main.go | 2 +- go.mod | 8 +++--- go.sum | 35 ++++++++------------------ pkg/login-app/cmd/cinematic.go | 2 +- pkg/login-app/cmd/dialog-checklogin.go | 2 +- pkg/login-app/cmd/go.mod | 18 +++++++++++++ pkg/login-app/cmd/go.sum | 22 ++++++++++++++++ pkg/login-app/cmd/main.go | 2 +- pkg/login-app/cmd/stream.go | 2 +- pkg/minichecker/cmd/checker.go | 2 +- pkg/minichecker/cmd/go.mod | 12 ++++++++- pkg/minichecker/cmd/go.sum | 23 +++++++++++++++++ token-validator/auth.go | 2 +- token-validator/auth_oidc.go | 2 +- token-validator/challenge.go | 2 +- token-validator/check.go | 2 +- token-validator/domain.go | 2 +- token-validator/grades.go | 2 +- token-validator/handler.go | 2 +- token-validator/ip.go | 2 +- token-validator/main.go | 2 +- token-validator/ping.go | 2 +- token-validator/ssh.go | 2 +- token-validator/students.go | 2 +- token-validator/wg.go | 2 +- 26 files changed, 109 insertions(+), 51 deletions(-) create mode 100644 pkg/login-app/cmd/go.mod create mode 100644 pkg/login-app/cmd/go.sum create mode 100644 pkg/minichecker/cmd/go.sum diff --git a/checker/checker.go b/checker/checker.go index 656eb95..2c65847 100644 --- a/checker/checker.go +++ b/checker/checker.go @@ -11,10 +11,10 @@ import ( "strings" "time" + "github.com/go-ping/ping" "github.com/miekg/dns" - "github.com/sparrc/go-ping" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) const ( diff --git a/checker/main.go b/checker/main.go index b5b66da..efde650 100644 --- a/checker/main.go +++ b/checker/main.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) func main() { diff --git a/go.mod b/go.mod index 6559e73..824acb2 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,18 @@ -module git.nemunai.re/lectures/adlin +module git.nemunai.re/srs/adlin go 1.16 require ( github.com/coreos/go-oidc v2.2.1+incompatible - github.com/gdamore/tcell/v2 v2.4.0 + github.com/go-ping/ping v0.0.0-20211014180314-6e2b003bffdd github.com/go-sql-driver/mysql v1.5.0 github.com/jcmturner/gokrb5/v8 v8.4.2 github.com/julienschmidt/httprouter v1.3.0 github.com/mdlayher/arp v0.0.0-20191213142603-f72070a231fc github.com/miekg/dns v1.1.41 github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac // indirect - github.com/rivo/tview 29d673af0ce2 - golang.org/x/oauth2 7df4dd6e12ab + golang.org/x/oauth2 v0.0.0-20210817223510-7df4dd6e12ab + golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005 // indirect gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/ldap.v2 v2.5.1 gopkg.in/square/go-jose.v2 v2.5.1 // indirect diff --git a/go.sum b/go.sum index 36fd57c..a3702fd 100644 --- a/go.sum +++ b/go.sum @@ -47,15 +47,11 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= -github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= -github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU= -github.com/gdamore/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0= -github.com/gdamore/tcell/v2 v2.2.0 h1:vSyEgKwraXPSOkvCk7IwOSyX+Pv3V2cV9CikJMXg4U4= -github.com/gdamore/tcell/v2 v2.2.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-ping/ping v0.0.0-20211014180314-6e2b003bffdd h1:WwvAAgvP2MO5bxYtSlDovMFWiTd9vi+Ey7CJ54wAUrc= +github.com/go-ping/ping v0.0.0-20211014180314-6e2b003bffdd/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -103,6 +99,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= +github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= @@ -132,12 +130,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= -github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= -github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= -github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg= -github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mdlayher/arp v0.0.0-20191213142603-f72070a231fc h1:m7rJJJeXrYCFpsxXYapkDW53wJCDmf9bsIXUg0HoeQY= github.com/mdlayher/arp v0.0.0-20191213142603-f72070a231fc/go.mod h1:eOj1DDj3NAZ6yv+WafaKzY37MFZ58TdfIhQ+8nQbiis= github.com/mdlayher/ethernet v0.0.0-20190313224307-5b5fc417d966 h1:O3p5UmisBhl3V6lgs4Vdfg8HpjzbWJPyOfGLdwVJSmI= @@ -151,11 +143,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac h1:jWKYCNlX4J5s8M0nHYkh7Y7c9gRVDEb3mq51j5J0F5M= github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac/go.mod h1:hoLfEwdY11HjRfKFH6KqnPsfxlo3BP6bJehpDv8t6sQ= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rivo/tview v0.0.0-20210312174852-ae9464cc3598 h1:AbRrGXhagPRDItERv7nauBUUPi7Ma3IGIj9FqkQKW6k= -github.com/rivo/tview v0.0.0-20210312174852-ae9464cc3598/go.mod h1:VzCN9WX13RF88iH2CaGkmdHOlsy1ZZQcTmNwROqC+LI= -github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= -github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -235,13 +222,15 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84 h1:duBc5zuJsmJXYOVVE/6PxejI+N3AaCqKjtsoLn1Je5Q= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210817223510-7df4dd6e12ab h1:llrcWN/wOwO+6gAyfBzxb5hZ+c3mriU/0+KNgYu6adA= +golang.org/x/oauth2 v0.0.0-20210817223510-7df4dd6e12ab/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -260,7 +249,6 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -282,17 +270,14 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY= golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005 h1:pDMpM2zh2MT0kHy037cKlSby2nEhD50SYqwQk76Nm40= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/pkg/login-app/cmd/cinematic.go b/pkg/login-app/cmd/cinematic.go index 8b52dee..f022b9a 100644 --- a/pkg/login-app/cmd/cinematic.go +++ b/pkg/login-app/cmd/cinematic.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) var screen tcell.Screen diff --git a/pkg/login-app/cmd/dialog-checklogin.go b/pkg/login-app/cmd/dialog-checklogin.go index edddbbe..8e82bac 100644 --- a/pkg/login-app/cmd/dialog-checklogin.go +++ b/pkg/login-app/cmd/dialog-checklogin.go @@ -4,7 +4,7 @@ import ( "math" "time" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rivo/tview" ) diff --git a/pkg/login-app/cmd/go.mod b/pkg/login-app/cmd/go.mod new file mode 100644 index 0000000..7aee3f1 --- /dev/null +++ b/pkg/login-app/cmd/go.mod @@ -0,0 +1,18 @@ +module git.nemunai.re/lectures/adlin/pkg/login-app/cmd + +go 1.17 + +require ( + github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 + github.com/rivo/tview v0.0.0-20211029142923-a4acb08f513e +) + +require ( + github.com/gdamore/encoding v1.0.0 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect + golang.org/x/text v0.3.6 // indirect +) diff --git a/pkg/login-app/cmd/go.sum b/pkg/login-app/cmd/go.sum new file mode 100644 index 0000000..0d891d9 --- /dev/null +++ b/pkg/login-app/cmd/go.sum @@ -0,0 +1,22 @@ +github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= +github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= +github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 h1:QqwPZCwh/k1uYqq6uXSb9TRDhTkfQbO80v8zhnIe5zM= +github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1/go.mod h1:Az6Jt+M5idSED2YPGtwnfJV0kXohgdCBPmHGSYc1r04= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= +github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/rivo/tview v0.0.0-20211029142923-a4acb08f513e h1:dVBzRaVTERZmv0MRjt8/a+afStgA+4tXk3PnrqT6mlo= +github.com/rivo/tview v0.0.0-20211029142923-a4acb08f513e/go.mod h1:WIfMkQNY+oq/mWwtsjOYHIZBuwthioY2srOmljJkTnk= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY= +golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= +golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/pkg/login-app/cmd/main.go b/pkg/login-app/cmd/main.go index 6aa0351..e0a97c3 100644 --- a/pkg/login-app/cmd/main.go +++ b/pkg/login-app/cmd/main.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rivo/tview" ) diff --git a/pkg/login-app/cmd/stream.go b/pkg/login-app/cmd/stream.go index cd295ea..9528c05 100644 --- a/pkg/login-app/cmd/stream.go +++ b/pkg/login-app/cmd/stream.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Stream updates a StreamDisplay with new data updates diff --git a/pkg/minichecker/cmd/checker.go b/pkg/minichecker/cmd/checker.go index dba6214..a187c47 100644 --- a/pkg/minichecker/cmd/checker.go +++ b/pkg/minichecker/cmd/checker.go @@ -11,8 +11,8 @@ import ( "strings" "time" + "github.com/go-ping/ping" "github.com/miekg/dns" - "github.com/sparrc/go-ping" ) const ( diff --git a/pkg/minichecker/cmd/go.mod b/pkg/minichecker/cmd/go.mod index 4b10de3..8c65fae 100644 --- a/pkg/minichecker/cmd/go.mod +++ b/pkg/minichecker/cmd/go.mod @@ -1 +1,11 @@ -module example.com/mod +module git.nemunai.re/srs/adlin/pkg/minichecker/cmd + +go 1.14 + +require ( + github.com/go-ping/ping v0.0.0-20211014180314-6e2b003bffdd + github.com/miekg/dns v1.1.43 + gopkg.in/fsnotify.v1 v1.4.7 +) + +require github.com/fsnotify/fsnotify v1.5.1 // indirect diff --git a/pkg/minichecker/cmd/go.sum b/pkg/minichecker/cmd/go.sum new file mode 100644 index 0000000..eb43b0e --- /dev/null +++ b/pkg/minichecker/cmd/go.sum @@ -0,0 +1,23 @@ +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/go-ping/ping v0.0.0-20211014180314-6e2b003bffdd h1:WwvAAgvP2MO5bxYtSlDovMFWiTd9vi+Ey7CJ54wAUrc= +github.com/go-ping/ping v0.0.0-20211014180314-6e2b003bffdd/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk= +github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= +github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg= +github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= diff --git a/token-validator/auth.go b/token-validator/auth.go index 97be90b..e4cf15c 100644 --- a/token-validator/auth.go +++ b/token-validator/auth.go @@ -14,7 +14,7 @@ import ( "github.com/jcmturner/gokrb5/v8/krberror" "github.com/julienschmidt/httprouter" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) var AuthFunc = checkAuthKrb5 diff --git a/token-validator/auth_oidc.go b/token-validator/auth_oidc.go index 590676a..7451bfd 100644 --- a/token-validator/auth_oidc.go +++ b/token-validator/auth_oidc.go @@ -13,7 +13,7 @@ import ( "github.com/coreos/go-oidc" "github.com/julienschmidt/httprouter" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) var ( diff --git a/token-validator/challenge.go b/token-validator/challenge.go index 51144f1..2e24609 100644 --- a/token-validator/challenge.go +++ b/token-validator/challenge.go @@ -16,7 +16,7 @@ import ( "github.com/julienschmidt/httprouter" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) const IPgwDMZ = "172.23.200.1" diff --git a/token-validator/check.go b/token-validator/check.go index c9e0ddc..c6cadd2 100644 --- a/token-validator/check.go +++ b/token-validator/check.go @@ -10,7 +10,7 @@ import ( "github.com/julienschmidt/httprouter" "github.com/miekg/dns" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) type checkGLUE struct { diff --git a/token-validator/domain.go b/token-validator/domain.go index 37ecb26..3874b5e 100644 --- a/token-validator/domain.go +++ b/token-validator/domain.go @@ -12,7 +12,7 @@ import ( "github.com/julienschmidt/httprouter" "github.com/miekg/dns" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) var ( diff --git a/token-validator/grades.go b/token-validator/grades.go index ef3c9c5..c7d9e4d 100644 --- a/token-validator/grades.go +++ b/token-validator/grades.go @@ -3,7 +3,7 @@ package main import ( "github.com/julienschmidt/httprouter" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) func init() { diff --git a/token-validator/handler.go b/token-validator/handler.go index d40be85..240224b 100644 --- a/token-validator/handler.go +++ b/token-validator/handler.go @@ -15,7 +15,7 @@ import ( "github.com/julienschmidt/httprouter" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) var router = httprouter.New() diff --git a/token-validator/ip.go b/token-validator/ip.go index 0a6e490..8944ec2 100644 --- a/token-validator/ip.go +++ b/token-validator/ip.go @@ -7,7 +7,7 @@ import ( "github.com/julienschmidt/httprouter" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) func init() { diff --git a/token-validator/main.go b/token-validator/main.go index a94d373..1ad21bd 100644 --- a/token-validator/main.go +++ b/token-validator/main.go @@ -14,7 +14,7 @@ import ( "strings" "syscall" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) var ( diff --git a/token-validator/ping.go b/token-validator/ping.go index 37a6290..04e2df7 100644 --- a/token-validator/ping.go +++ b/token-validator/ping.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) var PongSecret = "felixfixit" diff --git a/token-validator/ssh.go b/token-validator/ssh.go index f810571..9490aa5 100644 --- a/token-validator/ssh.go +++ b/token-validator/ssh.go @@ -15,7 +15,7 @@ import ( "github.com/julienschmidt/httprouter" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) var AuthorizedKeysLocation = "/root/.ssh/authorized_keys" diff --git a/token-validator/students.go b/token-validator/students.go index c8e7270..c961c96 100644 --- a/token-validator/students.go +++ b/token-validator/students.go @@ -9,7 +9,7 @@ import ( "github.com/julienschmidt/httprouter" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) func init() { diff --git a/token-validator/wg.go b/token-validator/wg.go index aa2fcd9..03d4f6e 100644 --- a/token-validator/wg.go +++ b/token-validator/wg.go @@ -13,7 +13,7 @@ import ( "github.com/julienschmidt/httprouter" - "git.nemunai.re/lectures/adlin/libadlin" + "git.nemunai.re/srs/adlin/libadlin" ) func init() {