linx-server: init at unstable-2021-12-24

We were forced to patch out a single broke upstream test, and have left
that patch as a pull request: ZizzyDizzyMC/linx-server#34.

Fixes #188667
This commit is contained in:
Colin Arnott 2022-11-26 05:24:30 +00:00
parent 2afac7a20c
commit 80d9e24cbf
No known key found for this signature in database
GPG Key ID: 0447A663F7F3E236
3 changed files with 109 additions and 0 deletions

View File

@ -0,0 +1,33 @@
{ buildGoModule
, fetchFromGitHub
, go-rice
, lib
}:
buildGoModule rec {
pname = "linx-server";
version = "unstable-2021-12-24";
src = fetchFromGitHub {
owner = "zizzydizzymc";
repo = pname;
rev = "3f503442f10fca68a3212975b23cf74d92c9988c";
hash = "sha256-tTHw/rIb2Gs5i5vZKsSgbUePIY7Np6HofBXu4TTjKbw=";
};
# upstream tests are broken, see zizzydizzymc/linx-server#34
patches = [ ./test.patch ];
vendorHash = "sha256-/N3AXrPyENp3li4X86LNXsfBYbjJulk+0EAyogPNIpc=";
nativeBuildInputs = [ go-rice ];
preBuild = "rice embed-go";
meta = with lib; {
description = "Self-hosted file/code/media sharing website.";
homepage = "https://put.icu";
license = licenses.gpl3Only;
maintainers = with maintainers; [ urandom ];
};
}

View File

@ -0,0 +1,74 @@
diff --git a/server_test.go b/server_test.go
index fc225ce..2df3608 100644
--- a/server_test.go
+++ b/server_test.go
@@ -446,63 +446,6 @@ func TestPostJSONUpload(t *testing.T) {
}
}
-func TestPostJSONUploadMaxExpiry(t *testing.T) {
- mux := setup()
- Config.maxExpiry = 300
-
- // include 0 to test edge case
- // https://github.com/andreimarcu/linx-server/issues/111
- testExpiries := []string{"86400", "-150", "0"}
- for _, expiry := range testExpiries {
- w := httptest.NewRecorder()
-
- filename := generateBarename() + ".txt"
-
- var b bytes.Buffer
- mw := multipart.NewWriter(&b)
- fw, err := mw.CreateFormFile("file", filename)
- if err != nil {
- t.Fatal(err)
- }
-
- fw.Write([]byte("File content"))
- mw.Close()
-
- req, err := http.NewRequest("POST", "/upload/", &b)
- req.Header.Set("Content-Type", mw.FormDataContentType())
- req.Header.Set("Accept", "application/json")
- req.Header.Set("Linx-Expiry", expiry)
- if err != nil {
- t.Fatal(err)
- }
-
- mux.ServeHTTP(w, req)
-
- if w.Code != 200 {
- t.Log(w.Body.String())
- t.Fatalf("Status code is not 200, but %d", w.Code)
- }
-
- var myjson RespOkJSON
- err = json.Unmarshal([]byte(w.Body.String()), &myjson)
- if err != nil {
- t.Fatal(err)
- }
-
- myExp, err := strconv.ParseInt(myjson.Expiry, 10, 64)
- if err != nil {
- t.Fatal(err)
- }
-
- expected := time.Now().Add(time.Duration(Config.maxExpiry) * time.Second).Unix()
- if myExp != expected {
- t.Fatalf("File expiry is not %d but %s", expected, myjson.Expiry)
- }
- }
-
- Config.maxExpiry = 0
-}
-
func TestPostExpiresJSONUpload(t *testing.T) {
mux := setup()
w := httptest.NewRecorder()
@@ -1301,5 +1244,4 @@ func TestPutAndGetCLI(t *testing.T) {
if !strings.HasPrefix(contentType, "text/plain") {
t.Fatalf("Didn't receive file directly but %s", contentType)
}
-
}

View File

@ -23844,6 +23844,8 @@ with pkgs;
listmonk = callPackage ../servers/mail/listmonk { };
linx-server = callPackage ../servers/web-apps/linx-server {};
livepeer = callPackage ../servers/livepeer { };
lwan = callPackage ../servers/http/lwan { };