Skip to content

The Unified and Autonomous Development Platform

fix: Some cargo bugs

Robin Shen9ef547aee092
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/rust.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/rust.svg
new file mode 100644
index 0000000000..a21848260d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/rust.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1783652658738" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1810" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1017.04003 499.502233l-43.639815-27.019885c-0.339999-3.999983-0.679997-7.859967-1.099995-11.75995l37.439841-34.999851a14.699937 14.699937 0 0 0-4.879979-24.499895l-47.999796-17.999924c-1.079995-3.759984-2.159991-7.559968-3.339986-11.279952l29.999872-41.659822a14.699937 14.699937 0 0 0-9.579959-23.079902l-50.839783-8.299965c-1.799992-3.459985-3.579985-6.899971-5.459977-10.299956l21.359909-46.8398a14.699937 14.699937 0 0 0-13.899941-20.779912l-51.63978 1.819992q-3.579985-4.439981-7.219969-8.799962L878.000622 163.683663a14.719937 14.719937 0 0 0-17.679925-17.679925L810.000911 157.863688q-4.339982-3.659984-8.799962-7.219969l1.819992-51.639781a14.699937 14.699937 0 0 0-20.779912-13.99994L735.401229 106.463907c-3.399986-1.879992-6.859971-3.679984-10.299956-5.459977l-8.299965-50.839784a14.699937 14.699937 0 0 0-23.079902-9.579959L652.001584 70.52406c-3.719984-1.179995-7.499968-2.25999-11.279952-3.339986l-17.999923-47.999796a14.699937 14.699937 0 0 0-24.499896-4.879979l-34.999851 37.439841c-3.899983-0.419998-7.819967-0.759997-11.75995-1.099996L524.502127 6.96433a14.699937 14.699937 0 0 0-24.999894 0L472.482348 50.604145c-3.999983 0.339999-7.859967 0.679997-11.75995 1.099995l-34.999851-37.439841a14.699937 14.699937 0 0 0-24.499895 4.879979l-17.999924 47.999796c-3.779984 1.099995-7.579968 2.159991-11.319951 3.359986l-41.639823-29.999872a14.699937 14.699937 0 0 0-23.079902 9.579959l-8.299965 50.819783c-3.459985 1.799992-6.899971 3.579985-10.319956 5.459977l-46.7998-21.259909a14.699937 14.699937 0 0 0-20.779912 13.99994l1.839992 51.61978c-2.979987 2.37999-5.999974 4.77998-8.839962 7.21997L163.683663 146.003738A14.719937 14.719937 0 0 0 146.003738 163.683663L157.863688 214.003449c-2.45999 2.899988-4.859979 5.859975-7.239969 8.819962l-51.619781-1.819992a14.839937 14.839937 0 0 0-12.739945 6.519972 14.699937 14.699937 0 0 0-1.139995 14.25994l21.319909 46.8198c-1.879992 3.399986-3.659984 6.859971-5.459977 10.319956l-50.819784 8.279965a14.699937 14.699937 0 0 0-9.579959 23.079902l29.999872 41.639822c-1.179995 3.739984-2.25999 7.539968-3.359985 11.319952l-47.999796 17.999924a14.699937 14.699937 0 0 0-4.879979 24.499895l37.439841 34.999851c-0.419998 3.899983-0.759997 7.819967-1.099996 11.75995l-43.719814 26.999885a14.699937 14.699937 0 0 0 0 24.999894l43.639815 27.019885c0.339999 3.999983 0.679997 7.839967 1.099995 11.73995l-37.439841 34.999851a14.699937 14.699937 0 0 0 4.87998 24.499895l47.999795 17.999924c1.099995 3.779984 2.159991 7.559968 3.359986 11.299952l-29.999872 41.659822a14.699937 14.699937 0 0 0 9.579959 23.079902l50.839783 8.299965c1.799992 3.439985 3.579985 6.899971 5.459977 10.279956l-21.259909 46.8598a14.699937 14.699937 0 0 0 1.139995 14.25994 14.259939 14.259939 0 0 0 12.739945 6.519972l51.659781-1.819992q3.539985 4.439981 7.199969 8.799962L146.003738 860.320697a14.719937 14.719937 0 0 0 17.679925 17.679925l50.319786-11.85995q4.359981 3.659984 8.819962 7.219969l-1.839992 51.639781a14.699937 14.699937 0 0 0 20.779912 13.89994l46.8598-21.359909c3.379986 1.879992 6.839971 3.659984 10.279956 5.459977l8.299965 50.839784a14.679937 14.679937 0 0 0 23.079902 9.559959l41.659822-29.999872c3.719984 1.199995 7.519968 2.25999 11.299952 3.359985l17.999924 47.999796a14.719937 14.719937 0 0 0 24.499895 4.879979l34.999851-37.43984c3.899983 0.419998 7.839967 0.759997 11.75995 1.099995l27.019885 43.639814a14.699937 14.699937 0 0 0 24.999894 0l27.019885-43.639814c3.999983-0.339999 7.859967-0.679997 11.75995-1.119995l34.999851 37.45984a14.719937 14.719937 0 0 0 24.499895-4.879979l17.999924-47.999796c3.779984-1.099995 7.559968-2.159991 11.299951-3.359985l41.639823 29.999872a14.679937 14.679937 0 0 0 23.079902-9.559959l8.299965-50.839784c3.439985-1.799992 6.899971-3.579985 10.299956-5.459977l46.8398 21.359909a14.699937 14.699937 0 0 0 20.779912-13.89994l-1.819992-51.639781q4.439981-3.579985 8.799962-7.219969l50.299786 11.85995a14.719937 14.719937 0 0 0 17.679925-17.679925L866.140672 810.000911q3.659984-4.339982 7.219969-8.799962l51.639781 1.819992a14.459938 14.459938 0 0 0 12.739945-6.519972 14.699937 14.699937 0 0 0 1.159995-14.25994l-21.359909-46.8398c1.879992-3.399986 3.659984-6.859971 5.459977-10.299956l50.839784-8.299965a14.699937 14.699937 0 0 0 9.579959-23.079902l-29.999872-41.659822c1.179995-3.739984 2.25999-7.519968 3.339985-11.299952l47.999796-17.999924a14.699937 14.699937 0 0 0 4.879979-24.499895l-37.43984-34.999851c0.419998-3.899983 0.759997-7.819967 1.099995-11.73995l43.639814-27.019885a14.699937 14.699937 0 0 0 0-24.999894z m-301.998714 258.158901A27.819882 27.819882 0 0 0 682.001456 779.021043l-15.279935 71.339696a375.018403 375.018403 0 0 1-312.718668-1.479993l-15.279935-71.319697a27.739882 27.739882 0 0 0-32.91986-21.359909l-63.019732 13.519943a374.758404 374.758404 0 0 1-32.519861-38.419837H516.60216c3.439985 0 5.779975-0.579998 5.779976-3.819983v-108.379539c0-3.139987-2.33999-3.819984-5.779976-3.819984h-89.659618l0.1-68.699707H524.002129c8.819962 0 47.319799 2.559989 59.579746 51.739779 3.819984 15.099936 12.339947 64.279726 18.119923 79.99966 5.779975 17.639925 29.199876 52.919775 54.199769 52.919775H814.000894a374.598405 374.598405 0 0 1-34.679852 40.179828z m51.53978 68.979706A30.47987 30.47987 0 1 1 736.001226 796.16097h0.879997a30.45987 30.45987 0 0 1 29.599873 30.47987z m-451.238079-1.359994a30.47987 30.47987 0 1 1-30.49987-30.49987h0.899996a30.49987 30.49987 0 0 1 29.499875 30.49987z m-176.199249-356.97848l65.65972-29.199876a27.759882 27.759882 0 0 0 14.11994-36.659844L205.383486 372.002776h53.119773v239.458981h-107.199543a375.298402 375.298402 0 0 1-12.159948-143.159391z m-22.519905-72.119693a30.47987 30.47987 0 0 1 30.459871-30.49987H148.00373a30.47987 30.47987 0 1 1-31.339867 30.47987z m310.318679 48.979792l0.1-70.6397h126.519461c6.559972 0 46.139804 7.539968 46.139804 37.239842 0 24.579895-30.379871 33.399858-55.359765 33.399858zM798.000962 613.421748c-19.599917 2.25999-41.259824-8.239965-43.999812-20.179914-11.559951-64.979723-30.779869-78.799664-61.13974-102.799562 37.719839-23.899898 76.919672-59.279748 76.919672-106.519547 0-51.039783-34.979851-83.179646-58.799749-98.959578-33.519857-21.999906-70.5597-26.459887-80.539657-26.459888h-397.798307a374.978403 374.978403 0 0 1 209.779107-118.379496l46.9398 49.199791a27.639882 27.639882 0 0 0 39.199834 0.879996l52.519776-49.999787a375.018403 375.018403 0 0 1 256.738907 182.859221l-35.999847 81.139655a27.999881 27.999881 0 0 0 14.17994 36.659844l69.179705 30.659869a374.238407 374.238407 0 0 1 0.799997 65.079723h-38.559836c-3.819984 0-5.379977 2.539989-5.379977 6.259974v17.639924C842.000775 602.001797 818.620874 611.161758 798.000962 613.421748zM480.002316 120.423847A30.47987 30.47987 0 0 1 510.422187 90.003977h0.899996A30.47987 30.47987 0 1 1 480.002316 120.423847zM873.68064 428.002538a30.47987 30.47987 0 1 1 0-60.959741h0.879996a30.47987 30.47987 0 0 1-0.879996 60.959741z" p-id="1811"></path></svg>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoHelpPanel.html b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoHelpPanel.html
index 5f75d45eb1..8d69a226df 100644
--- a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoHelpPanel.html
+++ b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoHelpPanel.html
@@ -1,6 +1,9 @@
<wicket:panel>
<div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Edit <code>$HOME/.cargo/config.toml</code> to add a registry like below</wicket:t></div>
- <div wicket:id="addRegistry"></div>
+ <div wicket:id="addRegistry" class="mb-5"></div>
+
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>And login to the registry</wicket:t></div>
+ <div wicket:id="registryAuth"></div>
<div class="text-muted font-size-sm mt-2 mb-5"><wicket:t>Make sure the user has package write permission over the project</wicket:t></div>
<div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Then publish package to the registry</wicket:t></div>
diff --git a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoHelpPanel.java b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoHelpPanel.java
index ce59553f78..611fba5670 100644
--- a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoHelpPanel.java
+++ b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoHelpPanel.java
@@ -26,8 +26,10 @@ public class CargoHelpPanel extends Panel {
var registryUrl = getServerUrl() + "/" + projectPath + "/~" + CargoPackHandler.HANDLER_ID + "/";
add(new CodeSnippetPanel("addRegistry", Model.of("" +
"[registries.onedev]\n" +
- "index = \"sparse+" + registryUrl + "\"\n\n" +
- "$ cargo login --registry onedev <onedev_access_token>")));
+ "index = \"sparse+" + registryUrl + "\"\n" +
+ "credential-provider = \"cargo:token\"")));
+
+ add(new CodeSnippetPanel("registryAuth", Model.of("$ cargo login --registry onedev <onedev_access_token>")));
add(new CodeSnippetPanel("publishCommand", Model.of("$ cargo publish --registry onedev")));
@@ -41,6 +43,7 @@ public class CargoHelpPanel extends Panel {
"cat << EOF >> $HOME/.cargo/config.toml\n" +
"[registries.onedev]\n" +
"index = \"sparse+" + registryUrl + "\"\n" +
+ "credential-provider = \"cargo:token\"\n" +
"EOF\n\n" +
"cat << EOF >> $HOME/.cargo/credentials.toml\n" +
"[registries.onedev]\n" +
diff --git a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackHandler.java b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackHandler.java
index 1a08a0fcea..1ba9da1291 100644
--- a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackHandler.java
+++ b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackHandler.java
@@ -5,7 +5,6 @@ import static io.onedev.server.plugin.pack.cargo.CargoPackSupport.TYPE;
import static io.onedev.server.util.UrlUtils.decodePath;
import static java.util.Comparator.comparing;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;
import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
@@ -28,6 +27,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.shiro.authz.UnauthorizedException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -101,38 +101,32 @@ public class CargoPackHandler implements PackHandler {
var isPut = method.equals("PUT");
var isDelete = method.equals("DELETE");
- try {
- if (pathSegments.equals(newArrayList("api", "v1", "crates", "new"))) {
- if (!isPut)
- throw new ClientException(SC_METHOD_NOT_ALLOWED);
- publish(request, response, projectId, buildId);
- } else if (pathSegments.size() == 6
- && pathSegments.subList(0, 3).equals(newArrayList("api", "v1", "crates"))
- && pathSegments.get(5).equals("download")) {
- if (!isGet)
- throw new ClientException(SC_METHOD_NOT_ALLOWED);
- download(response, projectId, decodePath(pathSegments.get(3)), decodePath(pathSegments.get(4)));
- } else if (pathSegments.size() == 6
- && pathSegments.subList(0, 3).equals(newArrayList("api", "v1", "crates"))
- && pathSegments.get(5).equals("yank")) {
- if (!isDelete)
- throw new ClientException(SC_METHOD_NOT_ALLOWED);
- setYanked(response, projectId, decodePath(pathSegments.get(3)), decodePath(pathSegments.get(4)), true);
- } else if (pathSegments.size() == 6
- && pathSegments.subList(0, 3).equals(newArrayList("api", "v1", "crates"))
- && pathSegments.get(5).equals("unyank")) {
- if (!isPut)
- throw new ClientException(SC_METHOD_NOT_ALLOWED);
- setYanked(response, projectId, decodePath(pathSegments.get(3)), decodePath(pathSegments.get(4)), false);
- } else if (isGet) {
- serveIndex(response, projectId, pathSegments);
- } else {
+ if (pathSegments.equals(newArrayList("api", "v1", "crates", "new"))) {
+ if (!isPut)
throw new ClientException(SC_METHOD_NOT_ALLOWED);
- }
- } catch (ClientException e) {
- response.setStatus(e.getStatusCode());
- if (e.getMessage() != null)
- writeError(response, e.getMessage());
+ publish(request, response, projectId, buildId);
+ } else if (pathSegments.size() == 6
+ && pathSegments.subList(0, 3).equals(newArrayList("api", "v1", "crates"))
+ && pathSegments.get(5).equals("download")) {
+ if (!isGet)
+ throw new ClientException(SC_METHOD_NOT_ALLOWED);
+ download(response, projectId, decodePath(pathSegments.get(3)), decodePath(pathSegments.get(4)));
+ } else if (pathSegments.size() == 6
+ && pathSegments.subList(0, 3).equals(newArrayList("api", "v1", "crates"))
+ && pathSegments.get(5).equals("yank")) {
+ if (!isDelete)
+ throw new ClientException(SC_METHOD_NOT_ALLOWED);
+ setYanked(response, projectId, decodePath(pathSegments.get(3)), decodePath(pathSegments.get(4)), true);
+ } else if (pathSegments.size() == 6
+ && pathSegments.subList(0, 3).equals(newArrayList("api", "v1", "crates"))
+ && pathSegments.get(5).equals("unyank")) {
+ if (!isPut)
+ throw new ClientException(SC_METHOD_NOT_ALLOWED);
+ setYanked(response, projectId, decodePath(pathSegments.get(3)), decodePath(pathSegments.get(4)), false);
+ } else if (isGet) {
+ serveIndex(response, projectId, pathSegments);
+ } else {
+ throw new ClientException(SC_METHOD_NOT_ALLOWED);
}
}
@@ -157,27 +151,19 @@ public class CargoPackHandler implements PackHandler {
throw new ClientException(SC_BAD_REQUEST, "Package version not specified");
if (!name.equals(name.toLowerCase()))
throw new ClientException(SC_BAD_REQUEST, "Package name should be lower case");
- var checksum = metadata.path("cksum").asText(null);
- if (StringUtils.isBlank(checksum))
- throw new ClientException(SC_BAD_REQUEST, "Package checksum not specified");
-
LockUtils.run(getLockName(projectId, name), () -> transactionService.run(() -> {
var project = checkProject(projectId, true);
- if (packService.findByNameAndVersion(project, TYPE, name, version) != null) {
- throw new ClientException(SC_CONFLICT,
- String.format("Package already exists (name: %s, version: %s)", name, version));
- }
-
- var packBlobId = packBlobService.uploadBlob(projectId, upload.crateFile, checksum);
- if (packBlobId == null)
- throw new ClientException(SC_BAD_REQUEST, "Digest mismatch");
+ var packBlobId = packBlobService.uploadBlob(projectId, upload.crateFile, null);
var packBlob = packBlobService.load(packBlobId);
- var pack = new Pack();
- pack.setType(TYPE);
- pack.setName(name);
- pack.setVersion(version);
- pack.setPrerelease(version.contains("-"));
- pack.setProject(project);
+ var pack = packService.findByNameAndVersion(project, TYPE, name, version);
+ if (pack == null) {
+ pack = new Pack();
+ pack.setType(TYPE);
+ pack.setName(name);
+ pack.setVersion(version);
+ pack.setPrerelease(version.contains("-"));
+ pack.setProject(project);
+ }
pack.setData(new CargoData(upload.metadata, packBlob.getSha256Hash()));
Build build = null;
if (buildId != null)
@@ -293,7 +279,9 @@ public class CargoPackHandler implements PackHandler {
if (publishMetadata.hasNonNull("rust_version"))
indexEntry.set("rust_version", publishMetadata.get("rust_version"));
indexEntry.put("v", 2);
- return objectMapper.writeValueAsBytes(indexEntry);
+ return objectMapper.writer()
+ .without(SerializationFeature.INDENT_OUTPUT)
+ .writeValueAsBytes(indexEntry);
} catch (IOException e) {
throw new ClientException(SC_BAD_REQUEST, "Invalid publish request body");
}
@@ -388,10 +376,6 @@ public class CargoPackHandler implements PackHandler {
}
}
- private void writeError(HttpServletResponse response, String message) {
- writeJson(response, Map.of("errors", List.of(Map.of("detail", message))));
- }
-
private String getLockName(Long projectId, String name) {
return "update-pack:" + projectId + ":" + TYPE + ":" + name;
}
@@ -410,15 +394,7 @@ public class CargoPackHandler implements PackHandler {
@Override
public String getApiKey(HttpServletRequest request) {
- var authzHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
- if (authzHeader != null) {
- if (authzHeader.toLowerCase().startsWith("bearer "))
- return StringUtils.substringAfter(authzHeader, " ");
- else
- return authzHeader;
- } else {
- return null;
- }
+ return request.getHeader(HttpHeaders.AUTHORIZATION);
}
@Override
diff --git a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.html b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.html
index e815dd7326..82ec12e7c4 100644
--- a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.html
+++ b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.html
@@ -1,11 +1,19 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Run below commands to install this package</wicket:t></div>
- <div wicket:id="install" class="code text-break font-size-sm mb-2"></div>
- <div wicket:id="readPermissionNote" class="text-muted font-size-sm mb-5"><wicket:t>Make sure the account has package read permission over the project</wicket:t></div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>To use this package, edit <code>$HOME/.cargo/config.toml</code> to add a registry like below</wicket:t></div>
+ <div wicket:id="registryConfig" class="mb-5"></div>
+
+ <wicket:enclosure child="registryAuth">
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>And login to the registry</wicket:t></div>
+ <div wicket:id="registryAuth"></div>
+ <div wicket:id="readPermissionNote" class="text-muted font-size-sm mt-2 mb-5"><wicket:t>Make sure the access token has package read permission over the project</wicket:t></div>
+ </wicket:enclosure>
+
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Then add the package</wicket:t></div>
+ <div wicket:id="install" class="mb-5"></div>
<div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, add this package to Cargo.toml and
run below to install the package via command step</wicket:t></div>
- <div wicket:id="jobCommands" class="text-break font-size-sm mb-5"></div>
+ <div wicket:id="jobCommands" class="mb-5"></div>
<div class="bg-light rounded p-4">
<h6 class="border-bottom pb-3"><wicket:t>Meta Info</wicket:t></h6>
diff --git a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.java b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.java
index 070c37fe91..1e8fa941c8 100644
--- a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.java
+++ b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackPanel.java
@@ -35,8 +35,17 @@ public class CargoPackPanel extends GenericPanel<Pack> {
var registryUrl = getServerUrl() + "/" + getPack().getProject().getPath() + "/~" + CargoPackHandler.HANDLER_ID + "/";
var canAccessAnonymously = SecurityUtils.asAnonymous().isPermitted(
new ProjectPermission(getPack().getProject(), new ReadPack()));
+ add(new CodeSnippetPanel("registryConfig", Model.of("" +
+ "[registries.onedev]\n" +
+ "index = \"sparse+" + registryUrl + "\"\n" +
+ "credential-provider = \"cargo:token\"")));
+ var registryAuth = new CodeSnippetPanel("registryAuth",
+ Model.of("$ cargo login --registry onedev <onedev_access_token>"));
+ registryAuth.setVisible(!canAccessAnonymously);
+ add(registryAuth);
add(new WebMarkupContainer("readPermissionNote").setVisible(!canAccessAnonymously));
- add(new Label("install", "$ cargo add " + getPack().getName() + "@" + getPack().getVersion() + " --registry onedev"));
+ add(new CodeSnippetPanel("install", Model.of(
+ "$ cargo add " + getPack().getName() + "@" + getPack().getVersion() + " --registry onedev")));
var jobCommands = "" +
"# " + _T("Use job token to tell OneDev the build using the package") + "\n" +
@@ -45,6 +54,7 @@ public class CargoPackPanel extends GenericPanel<Pack> {
"cat << EOF >> $HOME/.cargo/config.toml\n" +
"[registries.onedev]\n" +
"index = \"sparse+" + registryUrl + "\"\n" +
+ "credential-provider = \"cargo:token\"\n" +
"EOF\n\n" +
"cat << EOF >> $HOME/.cargo/credentials.toml\n" +
"[registries.onedev]\n" +
diff --git a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackSupport.java b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackSupport.java
index cd27f3006e..992d133d78 100644
--- a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackSupport.java
+++ b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/CargoPackSupport.java
@@ -24,7 +24,7 @@ public class CargoPackSupport implements PackSupport {
@Override
public String getPackIcon() {
- return "package";
+ return "rust";
}
@Override
diff --git a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/ClientException.java b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/ClientException.java
index bfbabf40e8..165fdb51f1 100644
--- a/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/ClientException.java
+++ b/server-plugin/server-plugin-pack-cargo/src/main/java/io/onedev/server/plugin/pack/cargo/ClientException.java
@@ -1,21 +1,16 @@
package io.onedev.server.plugin.pack.cargo;
-public class ClientException extends RuntimeException {
+import io.onedev.server.exception.HttpResponseAwareException;
- private static final long serialVersionUID = 1L;
+public class ClientException extends HttpResponseAwareException {
- private final int statusCode;
-
- public ClientException(int statusCode) {
- this(statusCode, null);
+ public ClientException(int statusCode, String errorMessage) {
+ super(statusCode, errorMessage);
}
- public ClientException(int statusCode, String message) {
- super(message);
- this.statusCode = statusCode;
- }
+ public ClientException(int statusCode) {
+ super(statusCode);
- public int getStatusCode() {
- return statusCode;
}
+
}
diff --git a/server-product/pom.xml b/server-product/pom.xml
index de9ad418e8..76a3c4b128 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -280,6 +280,11 @@
<artifactId>server-plugin-pack-container</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-pack-cargo</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>io.onedev</groupId>
<artifactId>server-plugin-pack-helm</artifactId>