diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2024-11-21 15:57:12 +0100 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2024-11-21 16:06:22 +0100 |
| commit | a587163c822e80527f6acc78c1edac3410327854 (patch) | |
| tree | 15ddd4ee5e2f7af01eeef98fb4adc4bd6c651776 | |
| parent | 72edbfe5d2d51b7dbaaa6ac6fe96cfbd43b60069 (diff) | |
Replace all links from GitHub to Codeberg
54 files changed, 138 insertions, 138 deletions
@@ -24,4 +24,4 @@ Contributions are welcome. Helping with translations can be done on weblate: [MIT](./LICENSE) ## Authors -This work is done by [@stevenwdv](https://github.com/stevenwdv) and [@jwijenbergh](https://github.com/jwijenbergh) at the [SURF](https://www.surf.nl/) and [GÉANT](https://geant.org/) organization. +This work is done by [@stevenwdv](https://github.com/stevenwdv) and [@jwijenbergh](https://codeberg.org/jwijenbergh) at the [SURF](https://www.surf.nl/) and [GÉANT](https://geant.org/) organization. diff --git a/client/client.go b/client/client.go index 708a4df..d3e438f 100644 --- a/client/client.go +++ b/client/client.go @@ -9,17 +9,17 @@ import ( "sync" "time" - "github.com/eduvpn/eduvpn-common/i18nerr" - "github.com/eduvpn/eduvpn-common/internal/api" - "github.com/eduvpn/eduvpn-common/internal/config" - "github.com/eduvpn/eduvpn-common/internal/discovery" - "github.com/eduvpn/eduvpn-common/internal/failover" - "github.com/eduvpn/eduvpn-common/internal/fsm" - "github.com/eduvpn/eduvpn-common/internal/http" - "github.com/eduvpn/eduvpn-common/internal/log" - "github.com/eduvpn/eduvpn-common/internal/server" - "github.com/eduvpn/eduvpn-common/types/cookie" - srvtypes "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/i18nerr" + "codeberg.org/eduVPN/eduvpn-common/internal/api" + "codeberg.org/eduVPN/eduvpn-common/internal/config" + "codeberg.org/eduVPN/eduvpn-common/internal/discovery" + "codeberg.org/eduVPN/eduvpn-common/internal/failover" + "codeberg.org/eduVPN/eduvpn-common/internal/fsm" + "codeberg.org/eduVPN/eduvpn-common/internal/http" + "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/internal/server" + "codeberg.org/eduVPN/eduvpn-common/types/cookie" + srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) diff --git a/client/client_test.go b/client/client_test.go index 8ded272..281ce55 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - httpw "github.com/eduvpn/eduvpn-common/internal/http" - "github.com/eduvpn/eduvpn-common/types/cookie" - "github.com/eduvpn/eduvpn-common/types/protocol" - srvtypes "github.com/eduvpn/eduvpn-common/types/server" + httpw "codeberg.org/eduVPN/eduvpn-common/internal/http" + "codeberg.org/eduVPN/eduvpn-common/types/cookie" + "codeberg.org/eduVPN/eduvpn-common/types/protocol" + srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) diff --git a/client/discovery.go b/client/discovery.go index 6cc76f6..596715f 100644 --- a/client/discovery.go +++ b/client/discovery.go @@ -5,9 +5,9 @@ import ( "sort" "strings" - "github.com/eduvpn/eduvpn-common/i18nerr" - "github.com/eduvpn/eduvpn-common/types/cookie" - discotypes "github.com/eduvpn/eduvpn-common/types/discovery" + "codeberg.org/eduVPN/eduvpn-common/i18nerr" + "codeberg.org/eduVPN/eduvpn-common/types/cookie" + discotypes "codeberg.org/eduVPN/eduvpn-common/types/discovery" ) func (c *Client) hasDiscovery() bool { diff --git a/client/fsm.go b/client/fsm.go index 7f16dce..728d572 100644 --- a/client/fsm.go +++ b/client/fsm.go @@ -3,9 +3,9 @@ package client import ( "fmt" - "github.com/eduvpn/eduvpn-common/i18nerr" - "github.com/eduvpn/eduvpn-common/internal/fsm" - "github.com/eduvpn/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/i18nerr" + "codeberg.org/eduVPN/eduvpn-common/internal/fsm" + "codeberg.org/eduVPN/eduvpn-common/internal/log" ) type ( diff --git a/client/token.go b/client/token.go index 03ec1d6..250173b 100644 --- a/client/token.go +++ b/client/token.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - srvtypes "github.com/eduvpn/eduvpn-common/types/server" + srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) diff --git a/cmd/cli/main.go b/cmd/cli/main.go index e7b2379..1edc463 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -9,11 +9,11 @@ import ( "reflect" "strings" - "github.com/eduvpn/eduvpn-common/client" - "github.com/eduvpn/eduvpn-common/internal/version" - "github.com/eduvpn/eduvpn-common/types/cookie" - srvtypes "github.com/eduvpn/eduvpn-common/types/server" - "github.com/eduvpn/eduvpn-common/util" + "codeberg.org/eduVPN/eduvpn-common/client" + "codeberg.org/eduVPN/eduvpn-common/internal/version" + "codeberg.org/eduVPN/eduvpn-common/types/cookie" + srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/util" "github.com/pkg/browser" ) diff --git a/docker/pip/amd64.dockerfile b/docker/pip/amd64.dockerfile index 572fdd3..8faf2d5 100644 --- a/docker/pip/amd64.dockerfile +++ b/docker/pip/amd64.dockerfile @@ -6,7 +6,7 @@ WORKDIR /pip ARG COMMONVERSION -RUN wget -O eduvpn-common.tar.xz https://github.com/eduvpn/eduvpn-common/releases/download/$COMMONVERSION/eduvpn-common-$COMMONVERSION.tar.xz +RUN wget -O eduvpn-common.tar.xz https://codeberg.org/eduVPN/eduvpn-common/releases/download/$COMMONVERSION/eduvpn-common-$COMMONVERSION.tar.xz RUN tar xf eduvpn-common.tar.xz WORKDIR /pip/eduvpn-common-$COMMONVERSION diff --git a/docker/pip/arm64.dockerfile b/docker/pip/arm64.dockerfile index cdd822c..b9a5092 100644 --- a/docker/pip/arm64.dockerfile +++ b/docker/pip/arm64.dockerfile @@ -6,7 +6,7 @@ WORKDIR /pip ARG COMMONVERSION -RUN wget -O eduvpn-common.tar.xz https://github.com/eduvpn/eduvpn-common/releases/download/$COMMONVERSION/eduvpn-common-$COMMONVERSION.tar.xz +RUN wget -O eduvpn-common.tar.xz https://codeberg.org/eduVPN/eduvpn-common/releases/download/$COMMONVERSION/eduvpn-common-$COMMONVERSION.tar.xz RUN tar xf eduvpn-common.tar.xz WORKDIR /pip/eduvpn-common-$COMMONVERSION diff --git a/docs/src/about.md b/docs/src/about.md index 08d7f9c..2066dde 100644 --- a/docs/src/about.md +++ b/docs/src/about.md @@ -18,7 +18,7 @@ The main goal is thus the following: This library tries to remove non-platform specific common functionality. This way eduVPN clients have less duplicate code. The building blocks that are removed by the library is not just the four depicted in this figure. You can think of other building blocks, such as logging and local configuration file saving. As can be seen in the figure, no User Interface (UI) code will be implemented. This is left to the eduVPN clients, on top of platform-specific code. ## License -[MIT](https://github.com/eduvpn/eduvpn-common/blob/main/LICENSE) +[MIT](https://codeberg.org/eduVPN/eduvpn-common/src/branch/main/LICENSE) ## Authors This library is written by [Steven Wallis de Vries](https://github.com/stevenwdv) and [Jeroen Wijenbergh](https://github.com/jwijenbergh) at the [SURF](https://www.surf.nl/) and [GÉANT](https://geant.org/) organization. diff --git a/docs/src/api/codeexamples.md b/docs/src/api/codeexamples.md index b3bcdc3..f47e99f 100644 --- a/docs/src/api/codeexamples.md +++ b/docs/src/api/codeexamples.md @@ -2,7 +2,7 @@ This chapter contains code examples that use the API ## Go command line client -The following is an example [in the repository](https://github.com/eduvpn/eduvpn-common/blob/v2/cmd/cli/main.go). It is a command line client with the following flags +The following is an example [in the repository](https://codeberg.org/eduVPN/eduvpn-common/src/branch/main/cmd/cli/main.go). It is a command line client with the following flags ``` -get-custom string The url of a custom server to connect to diff --git a/docs/src/api/letsbuildaclient.md b/docs/src/api/letsbuildaclient.md index b675ee0..e513157 100644 --- a/docs/src/api/letsbuildaclient.md +++ b/docs/src/api/letsbuildaclient.md @@ -110,7 +110,7 @@ Note that this state transition is essentially the same as the following code: ```python -def handler(old: int, new: int, data: str): -- # it's 6 because https://github.com/eduvpn/eduvpn-common/blob/b660911b5db000b43970f3754b5767bb50741360/client/fsm.go#L33 +- # it's 6 because https://codeberg.org/eduVPN/eduvpn-common/src/commit/b660911b5db000b43970f3754b5767bb50741360/client/fsm.go#L33 - if new == 6: - webbrowser.open(data) - return True diff --git a/docs/src/api/statemachine.md b/docs/src/api/statemachine.md index 57ca775..953bf2b 100644 --- a/docs/src/api/statemachine.md +++ b/docs/src/api/statemachine.md @@ -90,7 +90,7 @@ The current state is highlighted in the <span style="color:cyan">cyan</span> col ## State explanation -For the explanation of what all the different states mean, see the [client documentation](https://github.com/eduvpn/eduvpn-common/blob/v2/client/fsm.go#L14-L50) +For the explanation of what all the different states mean, see the [client documentation](https://codeberg.org/eduVPN/eduvpn-common/src/branch/main/client/fsm.go#L14-L50) ## States that ask data diff --git a/docs/src/api/wheretofinddocs.md b/docs/src/api/wheretofinddocs.md index f4ad5bf..cda485f 100644 --- a/docs/src/api/wheretofinddocs.md +++ b/docs/src/api/wheretofinddocs.md @@ -1,6 +1,6 @@ # Where to find API docs -The API documentation, depends on which wrapper you are using. If you're writing a wrapper yourself, or want some background information on how it works internally, you can find function docs in the [exports/exports.go](https://github.com/eduvpn/eduvpn-common/blob/v2/exports/exports.go) file it is available as autogenerated form [here](./functiondocs.md). +The API documentation, depends on which wrapper you are using. If you're writing a wrapper yourself, or want some background information on how it works internally, you can find function docs in the [exports/exports.go](https://codeberg.org/eduVPN/eduvpn-common/src/branch/main/exports/exports.go) file it is available as autogenerated form [here](./functiondocs.md). This file is commented using Go comment style. It gives a basic of what the function does, what it returns and what type of arguments you should pass to it. The API documentation for the Python wrapper can be [found here](https://eduvpn.github.io/eduvpn-common/api/python/rtd/index.html). -There is also a Go API that is defined in the [client package](https://github.com/eduvpn/eduvpn-common/tree/v2/client). However, this is not the primary use case for the library. +There is also a Go API that is defined in the [client package](https://codeberg.org/eduVPN/eduvpn-common/src/branch/main/client). However, this is not the primary use case for the library. diff --git a/docs/src/gettingstarted/building/example.md b/docs/src/gettingstarted/building/example.md index 902b419..58b1302 100644 --- a/docs/src/gettingstarted/building/example.md +++ b/docs/src/gettingstarted/building/example.md @@ -3,7 +3,7 @@ This section gives an example on how to build and install the library from scrat 1. Clone the library ```bash -git clone https://github.com/eduvpn/eduvpn-common +git clone https://codeberg.org/eduVPN/eduvpn-common ``` 2. Go to the library directory diff --git a/docs/src/gettingstarted/building/go.md b/docs/src/gettingstarted/building/go.md index 65d3c26..c120c0a 100644 --- a/docs/src/gettingstarted/building/go.md +++ b/docs/src/gettingstarted/building/go.md @@ -29,7 +29,7 @@ make clean ``` ## Note on releases -Releases are build with the go tag "release" (add flag "-tags=release") to bundle the discovery JSON files and embed them in the shared library. See the [make_release](https://github.com/eduvpn/eduvpn-common/blob/main/make_release.sh) script on how we bundle the files. A full command without the Makefile to build this library is: +Releases are build with the go tag "release" (add flag "-tags=release") to bundle the discovery JSON files and embed them in the shared library. See the [make_release](https://codeberg.org/eduVPN/eduvpn-common/src/branch/main/make_release.sh) script on how we bundle the files. A full command without the Makefile to build this library is: ```bash go build -o lib/libeduvpn_common-${VERSION}.so -tags=release -buildmode=c-shared ./exports diff --git a/docs/src/gettingstarted/building/release.md b/docs/src/gettingstarted/building/release.md index a0893ea..5c5e4e1 100644 --- a/docs/src/gettingstarted/building/release.md +++ b/docs/src/gettingstarted/building/release.md @@ -1,8 +1,8 @@ # Building for release -To build for release, make sure you obtain the tarball artifacts in the release (ending with `.tar.xz`) at <https://github.com/eduvpn/eduvpn-common/releases>. +To build for release, make sure you obtain the tarball artifacts in the release (ending with `.tar.xz`) at <https://codeberg.org/eduVPN/eduvpn-common/releases>. -These are signed with minisign and gpg keys, make sure to verify these signatures using the public keys available here: <https://github.com/eduvpn/eduvpn-common/tree/main/keys>, they are also available externally: +These are signed with minisign and gpg keys, make sure to verify these signatures using the public keys available here: <https://codeberg.org/eduVPN/eduvpn-common/src/branch/main/keys>, they are also available externally: - <https://app.eduvpn.org/linux/v4/deb/app+linux@eduvpn.org.asc> - <https://git.sr.ht/~jwijenbergh/python3-eduvpn-common.rpm/tree/main/item/SOURCES/minisign-CA9409316AC93C07.pub> diff --git a/docs/src/gettingstarted/testing.md b/docs/src/gettingstarted/testing.md index b072849..a3ed87d 100644 --- a/docs/src/gettingstarted/testing.md +++ b/docs/src/gettingstarted/testing.md @@ -13,7 +13,7 @@ Note that this runs the tests without any server interaction (so for now only th SERVER_URI="eduvpn.example.com" PORTAL_USER="example" PORTAL_PASS="example" make test ``` -This needs [python3-selenium](https://selenium-python.readthedocs.io/) and [geckodriver](https://github.com/mozilla/geckodriver/releases) (extract and put in your `$PATH`). Note that testing with a server assumes it uses a default portal, due to it needing to click on buttons on the web page. You can add your own portal by customizing the [called Selenium script](https://github.com/eduvpn/eduvpn-common/blob/main/selenium_eduvpn.py). +This needs [python3-selenium](https://selenium-python.readthedocs.io/) and [geckodriver](https://github.com/mozilla/geckodriver/releases) (extract and put in your `$PATH`). Note that testing with a server assumes it uses a default portal, due to it needing to click on buttons on the web page. You can add your own portal by customizing the [called Selenium script](https://codeberg.org/eduVPN/eduvpn-common/src/branch/main/selenium_eduvpn.py). If you have [Docker](https://www.docker.com/get-started/) installed and [Docker-compose](https://docs.docker.com/compose/install/) you can use a convenient helper script which starts up two containers - An eduVPN server for testing diff --git a/exports/exports.go b/exports/exports.go index 1347c35..61509bf 100644 --- a/exports/exports.go +++ b/exports/exports.go @@ -26,14 +26,14 @@ import ( "runtime/cgo" "unsafe" - "github.com/eduvpn/eduvpn-common/client" - "github.com/eduvpn/eduvpn-common/i18nerr" - "github.com/eduvpn/eduvpn-common/internal/log" - "github.com/eduvpn/eduvpn-common/proxy" - "github.com/eduvpn/eduvpn-common/types/cookie" - errtypes "github.com/eduvpn/eduvpn-common/types/error" - srvtypes "github.com/eduvpn/eduvpn-common/types/server" - "github.com/eduvpn/eduvpn-common/util" + "codeberg.org/eduVPN/eduvpn-common/client" + "codeberg.org/eduVPN/eduvpn-common/i18nerr" + "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/proxy" + "codeberg.org/eduVPN/eduvpn-common/types/cookie" + errtypes "codeberg.org/eduVPN/eduvpn-common/types/error" + srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/util" ) // VPNState is the current state of the library diff --git a/exports/exports_test_wrapper.go b/exports/exports_test_wrapper.go index a7305dd..3b64007 100644 --- a/exports/exports_test_wrapper.go +++ b/exports/exports_test_wrapper.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/eduvpn/eduvpn-common/internal/test" - "github.com/eduvpn/eduvpn-common/types/error" - "github.com/eduvpn/eduvpn-common/util" + "codeberg.org/eduVPN/eduvpn-common/internal/test" + "codeberg.org/eduVPN/eduvpn-common/types/error" + "codeberg.org/eduVPN/eduvpn-common/util" - httpw "github.com/eduvpn/eduvpn-common/internal/http" + httpw "codeberg.org/eduVPN/eduvpn-common/internal/http" ) func getString(in *C.char) string { @@ -1,4 +1,4 @@ -module github.com/eduvpn/eduvpn-common +module codeberg.org/eduVPN/eduvpn-common go 1.18 diff --git a/i18nerr/i18nerr.go b/i18nerr/i18nerr.go index 168cf84..95ad05a 100644 --- a/i18nerr/i18nerr.go +++ b/i18nerr/i18nerr.go @@ -7,8 +7,8 @@ import ( "fmt" "sync" - "github.com/eduvpn/eduvpn-common/internal/http" - "github.com/eduvpn/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/internal/http" + "codeberg.org/eduVPN/eduvpn-common/internal/log" "golang.org/x/text/language" "golang.org/x/text/message" diff --git a/internal/api/api.go b/internal/api/api.go index 9b794db..ea0fc6f 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -13,13 +13,13 @@ import ( "github.com/jwijenbergh/eduoauth-go" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" - "github.com/eduvpn/eduvpn-common/internal/api/endpoints" - "github.com/eduvpn/eduvpn-common/internal/api/profiles" - httpw "github.com/eduvpn/eduvpn-common/internal/http" - "github.com/eduvpn/eduvpn-common/internal/log" - "github.com/eduvpn/eduvpn-common/internal/wireguard" - "github.com/eduvpn/eduvpn-common/types/protocol" - "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/api/endpoints" + "codeberg.org/eduVPN/eduvpn-common/internal/api/profiles" + httpw "codeberg.org/eduVPN/eduvpn-common/internal/http" + "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/internal/wireguard" + "codeberg.org/eduVPN/eduvpn-common/types/protocol" + "codeberg.org/eduVPN/eduvpn-common/types/server" ) // Callbacks is the API callback interface diff --git a/internal/api/api_test.go b/internal/api/api_test.go index 9648544..1f70b20 100644 --- a/internal/api/api_test.go +++ b/internal/api/api_test.go @@ -14,12 +14,12 @@ import ( "testing" "time" - "github.com/eduvpn/eduvpn-common/internal/api/profiles" - httpw "github.com/eduvpn/eduvpn-common/internal/http" - "github.com/eduvpn/eduvpn-common/internal/test" - "github.com/eduvpn/eduvpn-common/internal/wireguard" - "github.com/eduvpn/eduvpn-common/types/protocol" - "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/api/profiles" + httpw "codeberg.org/eduVPN/eduvpn-common/internal/http" + "codeberg.org/eduVPN/eduvpn-common/internal/test" + "codeberg.org/eduVPN/eduvpn-common/internal/wireguard" + "codeberg.org/eduVPN/eduvpn-common/types/protocol" + "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) diff --git a/internal/api/cache.go b/internal/api/cache.go index 420a4b0..9a478df 100644 --- a/internal/api/cache.go +++ b/internal/api/cache.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/eduvpn/eduvpn-common/internal/api/endpoints" + "codeberg.org/eduVPN/eduvpn-common/internal/api/endpoints" ) // EndpointCache is a struct that caches well-known API endpoints diff --git a/internal/api/profiles/profiles.go b/internal/api/profiles/profiles.go index eba5ece..9f51064 100644 --- a/internal/api/profiles/profiles.go +++ b/internal/api/profiles/profiles.go @@ -3,8 +3,8 @@ package profiles import ( - "github.com/eduvpn/eduvpn-common/types/protocol" - "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/types/protocol" + "codeberg.org/eduVPN/eduvpn-common/types/server" ) // Profile is the information for a profile diff --git a/internal/config/config.go b/internal/config/config.go index 5ac01c4..9e924c1 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -7,12 +7,12 @@ import ( "os" "path" - "github.com/eduvpn/eduvpn-common/internal/config/atomicfile" - "github.com/eduvpn/eduvpn-common/internal/config/v1" - "github.com/eduvpn/eduvpn-common/internal/config/v2" - "github.com/eduvpn/eduvpn-common/internal/discovery" - "github.com/eduvpn/eduvpn-common/internal/log" - "github.com/eduvpn/eduvpn-common/internal/util" + "codeberg.org/eduVPN/eduvpn-common/internal/config/atomicfile" + "codeberg.org/eduVPN/eduvpn-common/internal/config/v1" + "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" + "codeberg.org/eduVPN/eduvpn-common/internal/discovery" + "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/internal/util" ) const stateFile = "state.json" diff --git a/internal/config/v1/v1.go b/internal/config/v1/v1.go index 04fdf6b..973c3d3 100644 --- a/internal/config/v1/v1.go +++ b/internal/config/v1/v1.go @@ -7,8 +7,8 @@ package v1 import ( "time" - "github.com/eduvpn/eduvpn-common/internal/api/profiles" - "github.com/eduvpn/eduvpn-common/internal/discovery" + "codeberg.org/eduVPN/eduvpn-common/internal/api/profiles" + "codeberg.org/eduVPN/eduvpn-common/internal/discovery" ) // Profiles is the list of profiles diff --git a/internal/config/v2/convert.go b/internal/config/v2/convert.go index 439716a..59b0d3e 100644 --- a/internal/config/v2/convert.go +++ b/internal/config/v2/convert.go @@ -3,8 +3,8 @@ package v2 import ( "time" - "github.com/eduvpn/eduvpn-common/internal/config/v1" - "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/config/v1" + "codeberg.org/eduVPN/eduvpn-common/types/server" ) func v1AuthTime(st time.Time, ost time.Time) time.Time { diff --git a/internal/config/v2/v2.go b/internal/config/v2/v2.go index 143d5f2..d23d26d 100644 --- a/internal/config/v2/v2.go +++ b/internal/config/v2/v2.go @@ -7,9 +7,9 @@ import ( "net/url" "time" - "github.com/eduvpn/eduvpn-common/internal/discovery" - "github.com/eduvpn/eduvpn-common/internal/log" - "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/discovery" + "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/types/server" ) // Server is the struct for each server diff --git a/internal/config/v2/v2_test.go b/internal/config/v2/v2_test.go index ce8de01..fe6c884 100644 --- a/internal/config/v2/v2_test.go +++ b/internal/config/v2/v2_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/eduvpn/eduvpn-common/internal/test" - "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/test" + "codeberg.org/eduVPN/eduvpn-common/types/server" ) func TestLoad(t *testing.T) { diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go index dc4c51e..b6fef6f 100644 --- a/internal/discovery/discovery.go +++ b/internal/discovery/discovery.go @@ -9,11 +9,11 @@ import ( "net/http" "time" - httpw "github.com/eduvpn/eduvpn-common/internal/http" - "github.com/eduvpn/eduvpn-common/internal/levenshtein" - "github.com/eduvpn/eduvpn-common/internal/log" - "github.com/eduvpn/eduvpn-common/internal/verify" - discotypes "github.com/eduvpn/eduvpn-common/types/discovery" + httpw "codeberg.org/eduVPN/eduvpn-common/internal/http" + "codeberg.org/eduVPN/eduvpn-common/internal/levenshtein" + "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/internal/verify" + discotypes "codeberg.org/eduVPN/eduvpn-common/types/discovery" ) // HasCache denotes whether or not we have an embedded cache available diff --git a/internal/discovery/discovery_test.go b/internal/discovery/discovery_test.go index 5672b9f..08c5ef8 100644 --- a/internal/discovery/discovery_test.go +++ b/internal/discovery/discovery_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/eduvpn/eduvpn-common/internal/test" - discotypes "github.com/eduvpn/eduvpn-common/types/discovery" + "codeberg.org/eduVPN/eduvpn-common/internal/test" + discotypes "codeberg.org/eduVPN/eduvpn-common/types/discovery" ) // TestServers tests whether or not we can obtain discovery servers diff --git a/internal/discovery/manager.go b/internal/discovery/manager.go index 51a0895..e71f13a 100644 --- a/internal/discovery/manager.go +++ b/internal/discovery/manager.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/eduvpn/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/internal/log" ) type Manager struct { diff --git a/internal/failover/monitor.go b/internal/failover/monitor.go index 6f3e551..a29c711 100644 --- a/internal/failover/monitor.go +++ b/internal/failover/monitor.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/eduvpn/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/internal/log" ) type sender interface { diff --git a/internal/failover/monitor_test.go b/internal/failover/monitor_test.go index 08b2e74..0808f31 100644 --- a/internal/failover/monitor_test.go +++ b/internal/failover/monitor_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/eduvpn/eduvpn-common/internal/test" + "codeberg.org/eduVPN/eduvpn-common/internal/test" ) // mockedPinger is a ping sender that always returns nil for sending diff --git a/internal/fsm/fsm_test.go b/internal/fsm/fsm_test.go index abe73e7..c160477 100644 --- a/internal/fsm/fsm_test.go +++ b/internal/fsm/fsm_test.go @@ -6,7 +6,7 @@ import ( "sort" "testing" - "github.com/eduvpn/eduvpn-common/internal/test" + "codeberg.org/eduVPN/eduvpn-common/internal/test" ) func TestSortSlice(t *testing.T) { diff --git a/internal/http/http.go b/internal/http/http.go index aeb113e..555c5bb 100644 --- a/internal/http/http.go +++ b/internal/http/http.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/eduvpn/eduvpn-common/internal/version" + "codeberg.org/eduVPN/eduvpn-common/internal/version" ) // UserAgent is the user agent that is used for requests diff --git a/internal/log/log.go b/internal/log/log.go index 02373c9..b4abab3 100644 --- a/internal/log/log.go +++ b/internal/log/log.go @@ -8,7 +8,7 @@ import ( "os" "path" - "github.com/eduvpn/eduvpn-common/internal/util" + "codeberg.org/eduVPN/eduvpn-common/internal/util" ) // FileLogger defines the type of logger that this package implements diff --git a/internal/server/custom.go b/internal/server/custom.go index dabf9e5..fe240e7 100644 --- a/internal/server/custom.go +++ b/internal/server/custom.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/eduvpn/eduvpn-common/internal/api" - "github.com/eduvpn/eduvpn-common/internal/config/v2" - "github.com/eduvpn/eduvpn-common/internal/log" - "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/api" + "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" + "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) diff --git a/internal/server/institute.go b/internal/server/institute.go index 4ddf939..8948443 100644 --- a/internal/server/institute.go +++ b/internal/server/institute.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/eduvpn/eduvpn-common/internal/api" - "github.com/eduvpn/eduvpn-common/internal/config/v2" - "github.com/eduvpn/eduvpn-common/internal/discovery" - "github.com/eduvpn/eduvpn-common/internal/log" - "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/api" + "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" + "codeberg.org/eduVPN/eduvpn-common/internal/discovery" + "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) diff --git a/internal/server/secureinternet.go b/internal/server/secureinternet.go index 9b4b873..1b786ed 100644 --- a/internal/server/secureinternet.go +++ b/internal/server/secureinternet.go @@ -5,12 +5,12 @@ import ( "errors" "time" - "github.com/eduvpn/eduvpn-common/internal/api" - "github.com/eduvpn/eduvpn-common/internal/config/v2" - "github.com/eduvpn/eduvpn-common/internal/discovery" - "github.com/eduvpn/eduvpn-common/internal/log" - "github.com/eduvpn/eduvpn-common/internal/util" - "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/api" + "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" + "codeberg.org/eduVPN/eduvpn-common/internal/discovery" + "codeberg.org/eduVPN/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/internal/util" + "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) diff --git a/internal/server/server.go b/internal/server/server.go index 8ec7a3f..e27b38e 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -7,11 +7,11 @@ import ( "os" "time" - "github.com/eduvpn/eduvpn-common/internal/api" - "github.com/eduvpn/eduvpn-common/internal/api/profiles" - v2 "github.com/eduvpn/eduvpn-common/internal/config/v2" - "github.com/eduvpn/eduvpn-common/types/protocol" - srvtypes "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/api" + "codeberg.org/eduVPN/eduvpn-common/internal/api/profiles" + v2 "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" + "codeberg.org/eduVPN/eduvpn-common/types/protocol" + srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" ) // Server is the struct for a single server diff --git a/internal/server/servers.go b/internal/server/servers.go index 023e622..d1aed97 100644 --- a/internal/server/servers.go +++ b/internal/server/servers.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/eduvpn/eduvpn-common/internal/api" - "github.com/eduvpn/eduvpn-common/internal/config/v2" - "github.com/eduvpn/eduvpn-common/internal/discovery" - srvtypes "github.com/eduvpn/eduvpn-common/types/server" + "codeberg.org/eduVPN/eduvpn-common/internal/api" + "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" + "codeberg.org/eduVPN/eduvpn-common/internal/discovery" + srvtypes "codeberg.org/eduVPN/eduvpn-common/types/server" "github.com/jwijenbergh/eduoauth-go" ) diff --git a/internal/test/server.go b/internal/test/server.go index 2f01c06..1abbd8c 100644 --- a/internal/test/server.go +++ b/internal/test/server.go @@ -8,7 +8,7 @@ import ( "net/http" "net/http/httptest" - httpw "github.com/eduvpn/eduvpn-common/internal/http" + httpw "codeberg.org/eduVPN/eduvpn-common/internal/http" ) // Server wraps a HTTP test server diff --git a/internal/wireguard/ini/ini_test.go b/internal/wireguard/ini/ini_test.go index 5168dda..faa45f2 100644 --- a/internal/wireguard/ini/ini_test.go +++ b/internal/wireguard/ini/ini_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/eduvpn/eduvpn-common/internal/test" + "codeberg.org/eduVPN/eduvpn-common/internal/test" ) func TestShouldSkip(t *testing.T) { diff --git a/internal/wireguard/wireguard.go b/internal/wireguard/wireguard.go index 9239835..8c2753b 100644 --- a/internal/wireguard/wireguard.go +++ b/internal/wireguard/wireguard.go @@ -6,7 +6,7 @@ import ( "fmt" "net" - "github.com/eduvpn/eduvpn-common/internal/wireguard/ini" + "codeberg.org/eduVPN/eduvpn-common/internal/wireguard/ini" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" ) diff --git a/internal/wireguard/wireguard_test.go b/internal/wireguard/wireguard_test.go index ba9ad1f..bd68afb 100644 --- a/internal/wireguard/wireguard_test.go +++ b/internal/wireguard/wireguard_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/eduvpn/eduvpn-common/internal/test" + "codeberg.org/eduVPN/eduvpn-common/internal/test" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" ) diff --git a/proxy/proxy.go b/proxy/proxy.go index 8df539a..439e239 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -9,9 +9,9 @@ import ( "codeberg.org/eduVPN/proxyguard" - "github.com/eduvpn/eduvpn-common/i18nerr" - httpw "github.com/eduvpn/eduvpn-common/internal/http" - "github.com/eduvpn/eduvpn-common/internal/log" + "codeberg.org/eduVPN/eduvpn-common/i18nerr" + httpw "codeberg.org/eduVPN/eduvpn-common/internal/http" + "codeberg.org/eduVPN/eduvpn-common/internal/log" ) // Logger is defined here such that we can update the proxyguard logger diff --git a/types/server/server.go b/types/server/server.go index b880543..26c41c3 100644 --- a/types/server/server.go +++ b/types/server/server.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "github.com/eduvpn/eduvpn-common/types/cookie" - "github.com/eduvpn/eduvpn-common/types/protocol" + "codeberg.org/eduVPN/eduvpn-common/types/cookie" + "codeberg.org/eduVPN/eduvpn-common/types/protocol" ) // Type gives the type of server diff --git a/util/util.go b/util/util.go index 3e07e0f..cd7ed9b 100644 --- a/util/util.go +++ b/util/util.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "github.com/eduvpn/eduvpn-common/i18nerr" + "codeberg.org/eduVPN/eduvpn-common/i18nerr" ) // CalculateGateway takes a CIDR encoded subnet `cidr` and returns the gateway and an error diff --git a/util/util_test.go b/util/util_test.go index c2e2a75..fd35088 100644 --- a/util/util_test.go +++ b/util/util_test.go @@ -3,7 +3,7 @@ package util import ( "testing" - "github.com/eduvpn/eduvpn-common/internal/test" + "codeberg.org/eduVPN/eduvpn-common/internal/test" ) func TestCalculateGateway(t *testing.T) { diff --git a/wrappers/python/docs/source/getting_started.rst b/wrappers/python/docs/source/getting_started.rst index 1d37db3..9c5b5fb 100644 --- a/wrappers/python/docs/source/getting_started.rst +++ b/wrappers/python/docs/source/getting_started.rst @@ -12,7 +12,7 @@ This documentation page describes the API for the python-eduvpn-common library. 2 Overview ---------- -This library interfaces with the Go library by loading the library as a shared C library (e.g. *.so* file for Linux) and then defining *ctypes*. This means that the library and the glue code needs to be in sync. When you install this library with a package manager or pip, we bundle this shared library with it so that the exact version matches. Note that you can also compile this shared library from source by following instructions at `the official documentation <https://github.com/eduvpn/eduvpn-common>`_. +This library interfaces with the Go library by loading the library as a shared C library (e.g. *.so* file for Linux) and then defining *ctypes*. This means that the library and the glue code needs to be in sync. When you install this library with a package manager or pip, we bundle this shared library with it so that the exact version matches. Note that you can also compile this shared library from source by following instructions at `the official documentation <https://codeberg.org/eduVPN/eduvpn-common>`_. There are various modules that this library defines, some are meant to be extensively used by the resulting eduVPN client, while others are purely meant for internal use. We give a general overview for each: @@ -118,7 +118,7 @@ Now for the final step, let's try connect to a server that has multiple profiles In practice, you should define these callbacks on every state transition (at least *ENTER* transitions) such that every case is handled. For example, there are also mandatory callbacks when asking for a location to connect to in case of secure internet. -A more elaborate example of the library can be found at `the GitHub repository <https://github.com/eduvpn/eduvpn-common/tree/main/wrappers/python/main.py>`_. +A more elaborate example of the library can be found at `the Codeberg repository <https://codeberg.org/eduVPN/eduvpn-common/src/branch/main/wrappers/python/main.py>`_. Or, a full featured example can be found by looking at `the official Linux client <https://github.com/eduvpn/python-eduvpn-client>`_. 4 API Documentation diff --git a/wrappers/python/setup.cfg b/wrappers/python/setup.cfg index f16f6c0..cda63a7 100644 --- a/wrappers/python/setup.cfg +++ b/wrappers/python/setup.cfg @@ -5,7 +5,7 @@ author = Jeroen Wijenbergh author_email = jeroen.wijenbergh@geant.org description = Python wrapper for eduvpn-common, a codebase to build eduVPN clients with long_description = file: README.md -url = https://github.com/eduvpn/eduvpn-common +url = https://codeberg.org/eduVPN/eduvpn-common license = MIT [options] |
