+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package com.webank.webase.front.transaction.entity; + +import java.util.List; +import javax.validation.constraints.NotNull; +import lombok.Data; +import org.hibernate.validator.constraints.NotBlank; + +/** + * get encoded function string + * @author marsli + */ +@Data +public class ReqEncodeFunction { + @NotBlank + private String funcName; + @NotNull + private List contractAbi; + @NotNull + private List funcParam; +} diff --git a/src/main/java/com/webank/webase/front/transaction/entity/ReqQueryTransHandle.java b/src/main/java/com/webank/webase/front/transaction/entity/ReqQueryTransHandle.java index 6a2945268..ed70626b8 100644 --- a/src/main/java/com/webank/webase/front/transaction/entity/ReqQueryTransHandle.java +++ b/src/main/java/com/webank/webase/front/transaction/entity/ReqQueryTransHandle.java @@ -1,9 +1,9 @@ package com.webank.webase.front.transaction.entity; -import lombok.Data; - import javax.validation.constraints.NotNull; +import lombok.Data; +import org.hibernate.validator.constraints.NotBlank; @Data public class ReqQueryTransHandle { @@ -12,7 +12,7 @@ public class ReqQueryTransHandle { @NotNull private String contractAddress; private String funcName; - @NotNull + @NotBlank private String contractAbi; private String userAddress = "0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB"; private int groupId =1 ; diff --git a/src/main/java/com/webank/webase/front/transaction/entity/ReqSignMessageHash.java b/src/main/java/com/webank/webase/front/transaction/entity/ReqSignMessageHash.java index 513b91541..f5ea800f9 100644 --- a/src/main/java/com/webank/webase/front/transaction/entity/ReqSignMessageHash.java +++ b/src/main/java/com/webank/webase/front/transaction/entity/ReqSignMessageHash.java @@ -22,8 +22,6 @@ import org.hibernate.validator.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; /** * signMessageHash interface parameter. @@ -37,5 +35,8 @@ public class ReqSignMessageHash { */ @NotNull(message = ConstantCode.PARAM_FAIL_USER_IS_EMPTY_STRING) private String user; + @NotBlank private String hash; + private String signUserId; + } diff --git a/src/main/java/com/webank/webase/front/util/NetUtils.java b/src/main/java/com/webank/webase/front/util/NetUtils.java new file mode 100644 index 000000000..be9984d8a --- /dev/null +++ b/src/main/java/com/webank/webase/front/util/NetUtils.java @@ -0,0 +1,86 @@ +/** + * Copyright 2014-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.webank.webase.front.util; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.Socket; + +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.tuple.Pair; + +import lombok.extern.slf4j.Slf4j; + +/** + * check port by telnet: if connection reachable, it means port in use + * @author marsli + */ +@Slf4j +public class NetUtils { + + public static Pair checkPorts(String ip, int timeout, int ... portArray) { + if (ArrayUtils.isEmpty(portArray)){ + return Pair.of(false,0); + } + + for (int port : portArray) { + boolean reachable = checkAddress(ip, port, timeout); + if (reachable){ + return Pair.of(true, port); + } + } + return Pair.of(false,0); + } + + + public static boolean checkAddress(String ip, int port, int timeout) { + int newTimeout = timeout > 0 ? timeout : 2000; + + try { + try (Socket crunchifySocket = new Socket()) { + // Connects this socket to the server with a specified timeout value. + crunchifySocket.connect(new InetSocketAddress(ip, port), newTimeout); + } + // Return true if connection successful + return true; + } catch (IOException e) { + log.error("Connect to host:[{}] and port:[{}] with timeout:[{}] is error:{}.", ip, port, newTimeout, e.getMessage() ); + } + return false; + } + + /** + * Check ip:port accessible. + * @param address format ip:port, like 129.204.174.191:6004; + * @param timeout + * @return + */ + public static boolean checkAddress(String address, int timeout) { + String[] ipPortArray = address.split(":"); + if (ArrayUtils.getLength(ipPortArray) != 2) { + log.error("Address:[{}] format error, should be [ip:port], like 129.204.174.191:6004.", address); + return false; + } + try { + int port = Integer.parseInt(ipPortArray[1]); + return checkAddress(ipPortArray[0], port, timeout); + } catch (Exception e) { + log.error("Address:[{}] port error, should be [ip:port], like 129.204.174.191:6004.", address); + } + return false; + } + +} \ No newline at end of file diff --git a/src/main/java/com/webank/webase/front/util/ValidateUtil.java b/src/main/java/com/webank/webase/front/util/ValidateUtil.java new file mode 100644 index 000000000..f0bde44fb --- /dev/null +++ b/src/main/java/com/webank/webase/front/util/ValidateUtil.java @@ -0,0 +1,67 @@ +/** + * Copyright 2014-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package com.webank.webase.front.util; + +import org.apache.commons.lang3.StringUtils; +import lombok.extern.log4j.Log4j2; + +/** + * ValidateUtil. + */ + +@Log4j2 +public class ValidateUtil { + public static final String IP_PATTERN = + "^((0|1\\d?\\d?|2[0-4]?\\d?|25[0-5]?|[3-9]\\d?)\\.){3}(0|1\\d?\\d?|2[0-4]?\\d?|25[0-5]?|[3-9]\\d?)$"; + + public static final String AGENCY_NAME_PATTERN = "^[0-9a-zA-Z_]+$"; + + /** + * Validate ipv4 address. + * + * @param ip + * @return return false if ip is not a valid IP format. + */ + public static boolean ipv4Valid(final String ip) { + if (StringUtils.isBlank(ip)) { + return false; + } + return ip.matches(IP_PATTERN); + } + + public static boolean validateAgencyName(final String agencyName) { + if (StringUtils.isBlank(agencyName)) { + return false; + } + return agencyName.matches(AGENCY_NAME_PATTERN); + } + + public static boolean validateUrl(String url) { + if (StringUtils.isBlank(url)) { + return false; + } + url = url.toLowerCase(); + String regex = "^((https|http|ftp|rtsp|mms)?://)" // https、http、ftp、rtsp、mms + + "?(([0-9a-z_!~*‘().&=+$%-]+: )?[0-9a-z_!~*‘().&=+$%-]+@)?" // ftp的user@ + + "(([0-9]{1,3}\\.){3}[0-9]{1,3}" // IP形式的URL- 例如：199.194.52.184 + + "|" // 允许IP和DOMAIN（域名） + + "([0-9a-z_!~*‘()-]+\\.)*" // 域名- www. + + "([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\\." // 二级域名 + + "[a-z]{2,6})" // first level domain- .com or .museum + + "(:[0-9]{1,5})?" // 端口号最大为65535,5位数 + + "((/?)|" // a slash isn‘t required if there is no file name + + "(/[0-9a-z_!~*‘().;?:@&=+$,%#-]+)+/?)$"; + return url.matches(regex); + } +} diff --git a/src/main/java/com/webank/webase/front/util/ZipUtils.java b/src/main/java/com/webank/webase/front/util/ZipUtils.java index b3e28975b..cb270ab7c 100644 --- a/src/main/java/com/webank/webase/front/util/ZipUtils.java +++ b/src/main/java/com/webank/webase/front/util/ZipUtils.java @@ -82,11 +82,9 @@ private static void generateFile(ZipOutputStream out, File file, String dir) thr if (file.isDirectory()) { //得到文件列表信息 File[] files = file.listFiles(); - - //将文件夹添加到下一级打包目录 - out.putNextEntry(new ZipEntry(dir + "/")); - dir = dir.length() == 0 ? "" : dir + "/"; + //将文件夹添加到下一级打包目录 + out.putNextEntry(new ZipEntry(dir)); //循环将文件夹中的文件打包 for (int i = 0; i < files.length; i++) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6fb538c42..344dd00c3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ # server version -version: v1.5.1 +version: v1.5.2 spring: datasource: diff --git a/src/main/resources/conf/gm/gmsdk.publickey b/src/main/resources/conf/gm/gmsdk.publickey new file mode 100644 index 000000000..46d9c60f4 --- /dev/null +++ b/src/main/resources/conf/gm/gmsdk.publickey @@ -0,0 +1 @@ +7e95dc204b7f83e686cb6317becba3e3a83e9e88c08f28c17e20db479b1abdb4b0629e1c3d40d5e696c518e4c857eb8cc2063cba159868c5b9f6f4287482d891 diff --git a/src/main/resources/conf/sdk.publickey b/src/main/resources/conf/sdk.publickey new file mode 100644 index 000000000..0eddc3691 --- /dev/null +++ b/src/main/resources/conf/sdk.publickey @@ -0,0 +1 @@ +508ad0422c058db68ab6b36c62bb5ed6d41ec28bf3118a5de536877b4bd979d72d13b181aab08eb106ef6b2d55b9c4475021ed7c9ab9d0ee5e867a118b74d35c diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 5afb04103..7ac69c057 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -15,7 +15,7 @@ vertical-align: -0.15em; fill: currentColor; overflow: hidden; - }
+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *
+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.webank.webase.front.util; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.Socket; + +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.tuple.Pair; + +import lombok.extern.slf4j.Slf4j; + +/** + * check port by telnet: if connection reachable, it means port in use + * @author marsli + */ +@Slf4j +public class NetUtils { + + public static Pair checkPorts(String ip, int timeout, int ... portArray) { + if (ArrayUtils.isEmpty(portArray)){ + return Pair.of(false,0); + } + + for (int port : portArray) { + boolean reachable = checkAddress(ip, port, timeout); + if (reachable){ + return Pair.of(true, port); + } + } + return Pair.of(false,0); + } + + + public static boolean checkAddress(String ip, int port, int timeout) { + int newTimeout = timeout > 0 ? timeout : 2000; + + try { + try (Socket crunchifySocket = new Socket()) { + // Connects this socket to the server with a specified timeout value. + crunchifySocket.connect(new InetSocketAddress(ip, port), newTimeout); + } + // Return true if connection successful + return true; + } catch (IOException e) { + log.error("Connect to host:[{}] and port:[{}] with timeout:[{}] is error:{}.", ip, port, newTimeout, e.getMessage() ); + } + return false; + } + + /** + * Check ip:port accessible. + * @param address format ip:port, like 129.204.174.191:6004; + * @param timeout + * @return + */ + public static boolean checkAddress(String address, int timeout) { + String[] ipPortArray = address.split(":"); + if (ArrayUtils.getLength(ipPortArray) != 2) { + log.error("Address:[{}] format error, should be [ip:port], like 129.204.174.191:6004.", address); + return false; + } + try { + int port = Integer.parseInt(ipPortArray[1]); + return checkAddress(ipPortArray[0], port, timeout); + } catch (Exception e) { + log.error("Address:[{}] port error, should be [ip:port], like 129.204.174.191:6004.", address); + } + return false; + } + +} \ No newline at end of file diff --git a/src/main/java/com/webank/webase/front/util/ValidateUtil.java b/src/main/java/com/webank/webase/front/util/ValidateUtil.java new file mode 100644 index 000000000..f0bde44fb --- /dev/null +++ b/src/main/java/com/webank/webase/front/util/ValidateUtil.java @@ -0,0 +1,67 @@ +/** + * Copyright 2014-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package com.webank.webase.front.util; + +import org.apache.commons.lang3.StringUtils; +import lombok.extern.log4j.Log4j2; + +/** + * ValidateUtil. + */ + +@Log4j2 +public class ValidateUtil { + public static final String IP_PATTERN = + "^((0|1\\d?\\d?|2[0-4]?\\d?|25[0-5]?|[3-9]\\d?)\\.){3}(0|1\\d?\\d?|2[0-4]?\\d?|25[0-5]?|[3-9]\\d?)$"; + + public static final String AGENCY_NAME_PATTERN = "^[0-9a-zA-Z_]+$"; + + /** + * Validate ipv4 address. + * + * @param ip + * @return return false if ip is not a valid IP format. + */ + public static boolean ipv4Valid(final String ip) { + if (StringUtils.isBlank(ip)) { + return false; + } + return ip.matches(IP_PATTERN); + } + + public static boolean validateAgencyName(final String agencyName) { + if (StringUtils.isBlank(agencyName)) { + return false; + } + return agencyName.matches(AGENCY_NAME_PATTERN); + } + + public static boolean validateUrl(String url) { + if (StringUtils.isBlank(url)) { + return false; + } + url = url.toLowerCase(); + String regex = "^((https|http|ftp|rtsp|mms)?://)" // https、http、ftp、rtsp、mms + + "?(([0-9a-z_!~*‘().&=+$%-]+: )?[0-9a-z_!~*‘().&=+$%-]+@)?" // ftp的user@ + + "(([0-9]{1,3}\\.){3}[0-9]{1,3}" // IP形式的URL- 例如：199.194.52.184 + + "|" // 允许IP和DOMAIN（域名） + + "([0-9a-z_!~*‘()-]+\\.)*" // 域名- www. + + "([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\\." // 二级域名 + + "[a-z]{2,6})" // first level domain- .com or .museum + + "(:[0-9]{1,5})?" // 端口号最大为65535,5位数 + + "((/?)|" // a slash isn‘t required if there is no file name + + "(/[0-9a-z_!~*‘().;?:@&=+$,%#-]+)+/?)$"; + return url.matches(regex); + } +} diff --git a/src/main/java/com/webank/webase/front/util/ZipUtils.java b/src/main/java/com/webank/webase/front/util/ZipUtils.java index b3e28975b..cb270ab7c 100644 --- a/src/main/java/com/webank/webase/front/util/ZipUtils.java +++ b/src/main/java/com/webank/webase/front/util/ZipUtils.java @@ -82,11 +82,9 @@ private static void generateFile(ZipOutputStream out, File file, String dir) thr if (file.isDirectory()) { //得到文件列表信息 File[] files = file.listFiles(); - - //将文件夹添加到下一级打包目录 - out.putNextEntry(new ZipEntry(dir + "/")); - dir = dir.length() == 0 ? "" : dir + "/"; + //将文件夹添加到下一级打包目录 + out.putNextEntry(new ZipEntry(dir)); //循环将文件夹中的文件打包 for (int i = 0; i < files.length; i++) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6fb538c42..344dd00c3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ # server version -version: v1.5.1 +version: v1.5.2 spring: datasource: diff --git a/src/main/resources/conf/gm/gmsdk.publickey b/src/main/resources/conf/gm/gmsdk.publickey new file mode 100644 index 000000000..46d9c60f4 --- /dev/null +++ b/src/main/resources/conf/gm/gmsdk.publickey @@ -0,0 +1 @@ +7e95dc204b7f83e686cb6317becba3e3a83e9e88c08f28c17e20db479b1abdb4b0629e1c3d40d5e696c518e4c857eb8cc2063cba159868c5b9f6f4287482d891 diff --git a/src/main/resources/conf/sdk.publickey b/src/main/resources/conf/sdk.publickey new file mode 100644 index 000000000..0eddc3691 --- /dev/null +++ b/src/main/resources/conf/sdk.publickey @@ -0,0 +1 @@ +508ad0422c058db68ab6b36c62bb5ed6d41ec28bf3118a5de536877b4bd979d72d13b181aab08eb106ef6b2d55b9c4475021ed7c9ab9d0ee5e867a118b74d35c diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 5afb04103..7ac69c057 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -15,7 +15,7 @@ vertical-align: -0.15em; fill: currentColor; overflow: hidden; - }
+ * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package com.webank.webase.front.util; + +import org.apache.commons.lang3.StringUtils; +import lombok.extern.log4j.Log4j2; + +/** + * ValidateUtil. + */ + +@Log4j2 +public class ValidateUtil { + public static final String IP_PATTERN = + "^((0|1\\d?\\d?|2[0-4]?\\d?|25[0-5]?|[3-9]\\d?)\\.){3}(0|1\\d?\\d?|2[0-4]?\\d?|25[0-5]?|[3-9]\\d?)$"; + + public static final String AGENCY_NAME_PATTERN = "^[0-9a-zA-Z_]+$"; + + /** + * Validate ipv4 address. + * + * @param ip + * @return return false if ip is not a valid IP format. + */ + public static boolean ipv4Valid(final String ip) { + if (StringUtils.isBlank(ip)) { + return false; + } + return ip.matches(IP_PATTERN); + } + + public static boolean validateAgencyName(final String agencyName) { + if (StringUtils.isBlank(agencyName)) { + return false; + } + return agencyName.matches(AGENCY_NAME_PATTERN); + } + + public static boolean validateUrl(String url) { + if (StringUtils.isBlank(url)) { + return false; + } + url = url.toLowerCase(); + String regex = "^((https|http|ftp|rtsp|mms)?://)" // https、http、ftp、rtsp、mms + + "?(([0-9a-z_!~*‘().&=+$%-]+: )?[0-9a-z_!~*‘().&=+$%-]+@)?" // ftp的user@ + + "(([0-9]{1,3}\\.){3}[0-9]{1,3}" // IP形式的URL- 例如：199.194.52.184 + + "|" // 允许IP和DOMAIN（域名） + + "([0-9a-z_!~*‘()-]+\\.)*" // 域名- www. + + "([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\\." // 二级域名 + + "[a-z]{2,6})" // first level domain- .com or .museum + + "(:[0-9]{1,5})?" // 端口号最大为65535,5位数 + + "((/?)|" // a slash isn‘t required if there is no file name + + "(/[0-9a-z_!~*‘().;?:@&=+$,%#-]+)+/?)$"; + return url.matches(regex); + } +} diff --git a/src/main/java/com/webank/webase/front/util/ZipUtils.java b/src/main/java/com/webank/webase/front/util/ZipUtils.java index b3e28975b..cb270ab7c 100644 --- a/src/main/java/com/webank/webase/front/util/ZipUtils.java +++ b/src/main/java/com/webank/webase/front/util/ZipUtils.java @@ -82,11 +82,9 @@ private static void generateFile(ZipOutputStream out, File file, String dir) thr if (file.isDirectory()) { //得到文件列表信息 File[] files = file.listFiles(); - - //将文件夹添加到下一级打包目录 - out.putNextEntry(new ZipEntry(dir + "/")); - dir = dir.length() == 0 ? "" : dir + "/"; + //将文件夹添加到下一级打包目录 + out.putNextEntry(new ZipEntry(dir)); //循环将文件夹中的文件打包 for (int i = 0; i < files.length; i++) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6fb538c42..344dd00c3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ # server version -version: v1.5.1 +version: v1.5.2 spring: datasource: diff --git a/src/main/resources/conf/gm/gmsdk.publickey b/src/main/resources/conf/gm/gmsdk.publickey new file mode 100644 index 000000000..46d9c60f4 --- /dev/null +++ b/src/main/resources/conf/gm/gmsdk.publickey @@ -0,0 +1 @@ +7e95dc204b7f83e686cb6317becba3e3a83e9e88c08f28c17e20db479b1abdb4b0629e1c3d40d5e696c518e4c857eb8cc2063cba159868c5b9f6f4287482d891 diff --git a/src/main/resources/conf/sdk.publickey b/src/main/resources/conf/sdk.publickey new file mode 100644 index 000000000..0eddc3691 --- /dev/null +++ b/src/main/resources/conf/sdk.publickey @@ -0,0 +1 @@ +508ad0422c058db68ab6b36c62bb5ed6d41ec28bf3118a5de536877b4bd979d72d13b181aab08eb106ef6b2d55b9c4475021ed7c9ab9d0ee5e867a118b74d35c diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 5afb04103..7ac69c057 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -15,7 +15,7 @@ vertical-align: -0.15em; fill: currentColor; overflow: hidden; - }