Fixing security holes

Author: xxxxbxxxxx

.gitignore

@@ -1,7 +1,10 @@
+# target
+target/
 # idea
 .idea/
 # Compiled class file
 *.class
+.DS_Store
 
 # Log file
 *.log

README.md

@@ -1,4 +1,5 @@
 # fofa-java
+
 [![GitHub (pre-)release](https://img.shields.io/github/release/0nise/fofa-java/all.svg)](https://github.com/0nise/fofa-java/releases)
 [![stars](https://img.shields.io/github/stars/0nise/fofa-java.svg)](https://github.com/0nise/fofa-java/stargazers)
 [![license](https://img.shields.io/github/license/0nise/fofa-java.svg)](https://github.com/0nise/fofa-java/blob/master/LICENSE)
@@ -10,58 +11,80 @@
 ## FOFA SDK
 A `Java` version of the `SDK`, based on the [`FOFA Pro API`](https://fofa.so/api), makes it easy for Java developers to quickly integrate [`FOFA Pro`](https://fofa.so) into their projects.
 ## add dependency
+
 ### Apache Maven
+
 ```
 <dependency>
   <groupId>com.r4v3zn.fofa</groupId>
   <artifactId>fofa-core</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.2.RELEASE</version>
 </dependency>
 ```
+
 ### Gradle Groovy DSL
+
 ```java
-implementation 'com.r4v3zn.fofa:fofa-core:1.0.0'
+implementation 'com.r4v3zn.fofa:fofa-core:1.0.2.RELEASE'
 ```
+
 ### Gradle Kotlin DSL
+
 ```java
-compile("com.r4v3zn.fofa:fofa-core:1.0.0")
+implementation("com.r4v3zn.fofa:fofa-core:1.0.2.RELEASE")
 ```
+
 ### Scala SBT
+
 ```java
-libraryDependencies += "com.r4v3zn.fofa" % "fofa-core" % "1.0.0"
+libraryDependencies += "com.r4v3zn.fofa" % "fofa-core" % "1.0.2.RELEASE"
 ```
+
 ### Apache Ivy
+
 ```java
-<dependency org="com.r4v3zn.fofa" name="fofa-core" rev="1.0.0" />
+<dependency org="com.r4v3zn.fofa" name="fofa-core" rev="1.0.2.RELEASE" />
 ```
+
 ### Groovy Grape
+
 ```java
 @Grapes(
-  @Grab(group='com.r4v3zn.fofa', module='fofa-core', version='1.0.0')
+  @Grab(group='com.r4v3zn.fofa', module='fofa-core', version='1.0.2.RELEASE')
 )
 ```
+
 ### Leiningen
+
 ```java
-[com.r4v3zn.fofa/fofa-core "1.0.0"]
+[com.r4v3zn.fofa/fofa-core "1.0.2.RELEASE"]
 ```
+
 ### Apache Buildr
+
 ```java
-'com.r4v3zn.fofa:fofa-core:jar:1.0.0'
+'com.r4v3zn.fofa:fofa-core:jar:1.0.2.RELEASE'
 ```
+
 ### Maven Central Badge
+
 ```java
 [![Maven Central](https://img.shields.io/maven-central/v/com.r4v3zn.fofa/fofa-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.r4v3zn.fofa%22%20AND%20a:%22fofa-core%22)
 ```
+
 ### PURL
+
 ```java
-pkg:maven/com.r4v3zn.fofa/fofa-core@1.0.0
+pkg:maven/com.r4v3zn.fofa/fofa-core@1.0.2.RELEASE
 ```
+
 ### Bazel
+
 ```java
 maven_jar(
     name = "fofa-core",
-    artifact = "com.r4v3zn.fofa:fofa-core:1.0.0",
-    sha1 = "93b888a1d1c42c696f60f246585609d66f72eb8b",
+    artifact = "com.r4v3zn.fofa:fofa-core:1.0.2.RELEASE",
+    sha1 = "669cac1d690068d60a8e9968d86340b8769810cb",
 )
 ```
 
@@ -109,6 +132,10 @@ FofaData{mode='extended', page=1, size=8578, totalPage=86, query='app="Solr"', r
 
 ## Update Log
 
+2020-04-27
+
+    - Fixing security holes
+
 2020-01-04
 
     - Fixing security holes

README_zh.md

@@ -1,70 +1,98 @@
 # fofa-java
+
 [![GitHub (pre-)release](https://img.shields.io/github/release/fofapro/fofa-java/all.svg)](https://github.com/0nise/fofa-java/releases)
 [![stars](https://img.shields.io/github/stars/fofapro/fofa-java.svg)](https://github.com/0nise/fofa-java/stargazers)
 [![license](https://img.shields.io/github/license/fofapro/fofa-java.svg)](https://github.com/0nise/fofa-java/blob/master/LICENSE)
 
 [English document](https://github.com/0nise/fofa-java/blob/master/README.md)
 
 ## FOFA Pro API
+
 [`FOFA Pro API`](https://fofa.so/api) 是资产搜索引擎 [`FOFA Pro`](https://fofa.so) 为开发者提供的 `RESTful API` 接口, 允许开发者在自己的项目中集成 [`FOFA Pro`](https://fofa.so) 的功能。
+
 ## FOFA SDK
+
 基于 [`FOFA Pro API`](https://fofa.so/api) 编写的 `java` 版 `SDK`, 方便 java 开发者快速将 [`FOFA Pro`](https://fofa.so) 集成到自己的项目中。
+
 ## 添加依赖
+
 ### Apache Maven
+
 ```
 <dependency>
   <groupId>com.r4v3zn.fofa</groupId>
   <artifactId>fofa-core</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.2.RELEASE</version>
 </dependency>
 ```
+
 ### Gradle Groovy DSL
+
 ```java
-implementation 'com.r4v3zn.fofa:fofa-core:1.0.0'
+implementation 'com.r4v3zn.fofa:fofa-core:1.0.2.RELEASE'
 ```
+
 ### Gradle Kotlin DSL
+
 ```java
-compile("com.r4v3zn.fofa:fofa-core:1.0.0")
+implementation("com.r4v3zn.fofa:fofa-core:1.0.2.RELEASE")
 ```
+
 ### Scala SBT
+
 ```java
-libraryDependencies += "com.r4v3zn.fofa" % "fofa-core" % "1.0.0"
+libraryDependencies += "com.r4v3zn.fofa" % "fofa-core" % "1.0.2.RELEASE"
 ```
+
 ### Apache Ivy
+
 ```java
-<dependency org="com.r4v3zn.fofa" name="fofa-core" rev="1.0.0" />
+<dependency org="com.r4v3zn.fofa" name="fofa-core" rev="1.0.2.RELEASE" />
 ```
+
 ### Groovy Grape
+
 ```java
 @Grapes(
-  @Grab(group='com.r4v3zn.fofa', module='fofa-core', version='1.0.0')
+  @Grab(group='com.r4v3zn.fofa', module='fofa-core', version='1.0.2.RELEASE')
 )
 ```
+
 ### Leiningen
+
 ```java
-[com.r4v3zn.fofa/fofa-core "1.0.0"]
+[com.r4v3zn.fofa/fofa-core "1.0.2.RELEASE"]
 ```
+
 ### Apache Buildr
+
 ```java
-'com.r4v3zn.fofa:fofa-core:jar:1.0.0'
+'com.r4v3zn.fofa:fofa-core:jar:1.0.2.RELEASE'
 ```
+
 ### Maven Central Badge
+
 ```java
 [![Maven Central](https://img.shields.io/maven-central/v/com.r4v3zn.fofa/fofa-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.r4v3zn.fofa%22%20AND%20a:%22fofa-core%22)
 ```
+
 ### PURL
+
 ```java
-pkg:maven/com.r4v3zn.fofa/fofa-core@1.0.0
+pkg:maven/com.r4v3zn.fofa/fofa-core@1.0.2.RELEASE
 ```
+
 ### Bazel
+
 ```java
 maven_jar(
     name = "fofa-core",
-    artifact = "com.r4v3zn.fofa:fofa-core:1.0.0",
-    sha1 = "93b888a1d1c42c696f60f246585609d66f72eb8b",
+    artifact = "com.r4v3zn.fofa:fofa-core:1.0.2.RELEASE",
+    sha1 = "669cac1d690068d60a8e9968d86340b8769810cb",
 )
 ```
 
+
 ## 使用
 
 |字段名称|描述|
@@ -109,6 +137,10 @@ FofaData{mode='extended', page=1, size=8578, totalPage=86, query='app="Solr"', r
 
 ## 更新日志
 
+2020-04-27
+
+    - 修复安全漏洞
+
 2020-01-04
 
     - 修复安全漏洞

fofa-core.iml

@@ -5,14 +5,13 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.4" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
   </component>
 </module>

pom.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2019. r4v3zn.
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -20,7 +35,7 @@
             </plugin>
         </plugins>
     </build>
-    <version>1.0.1.RELEASE</version>
+    <version>1.0.2.RELEASE</version>
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>

src/main/java/com/r4v3zn/fofa/core/DO/FofaData.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2019. r4v3zn.
+ * 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.r4v3zn.fofa.core.DO;
 
 import java.util.List;

src/main/java/com/r4v3zn/fofa/core/DO/User.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2019. r4v3zn.
+ * 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.r4v3zn.fofa.core.DO;
 
 import com.r4v3zn.fofa.core.enmus.UserVipLevelEnum;

src/main/java/com/r4v3zn/fofa/core/DO/UserLogin.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2019. r4v3zn.
+ * 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.r4v3zn.fofa.core.DO;
 
 /**

src/main/java/com/r4v3zn/fofa/core/client/FofaClient.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2019. r4v3zn.
+ * 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.r4v3zn.fofa.core.client;
 
 import com.fasterxml.jackson.databind.JsonNode;

src/main/java/com/r4v3zn/fofa/core/constants/FofaClientConsts.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2019. r4v3zn.
+ * 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.r4v3zn.fofa.core.constants;
 
 /**