Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #161 (Add CHANGELOG.md) #162

Merged
merged 13 commits into from
Dec 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions .github/workflows/code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ jobs:

echo "copy dongtai agent java to tomcat..."
cp DongTai-agent-java/release/iast-agent.jar apache-tomcat-8.5.40/iast/agent.jar
cp DongTai-agent-java/release/lib/iast-core.jar apache-tomcat-8.5.40/temp/iast-core.jar
cp DongTai-agent-java/release/lib/iast-inject.jar apache-tomcat-8.5.40/temp/iast-inject.jar
cp DongTai-agent-java/release/lib/*.jar apache-tomcat-8.5.40/temp/
cd apache-tomcat-8.5.40

echo "init mysql"
Expand All @@ -106,17 +105,43 @@ jobs:
./spider.sh

echo "waitting for send vuls data"
sleep 600
sleep 120

echo "shutdown tomcat"
PID=$(ps aux|grep "org.apache.catalina.startup.Bootstrap start"|grep -v grep |awk '{print $2}')
echo "tomcat pid is: $PID"
kill $PID
ps aux

- name: Benchmark-Vulns-Test
run: |
pwd
ls -l
java -version
mvn -version
# download Benchmark
# Copy Agent To Benchmark
# Run
cd ..
git clone https://github.com/exexute/BenchmarkJava.git
cd BenchmarkJava
mvn clean package cargo:start -Pdeploywdongtai

cp ../DongTai-agent-java/release/iast-agent.jar tools/DongTai/dongtai.jar
cp ../DongTai-agent-java/release/lib/*.jar target/cargo/installs/apache-tomcat-8.5.70/apache-tomcat-8.5.70/temp

echo "run benchmark in backend"
export JAVA_TOOL_OPTIONS="-Dproject.create=true -Dproject.version=${{ github.event_name }}-${{ github.run_number }}"
nohup mvn package cargo:run -Pdeploywdongtai &

echo "wait for benchmark start..."
sleep 60

echo "build Crawler"
git clone https://github.com/OWASP-Benchmark/BenchmarkUtils.git
cd BenchmarkUtils
mvn install

echo "run Crawler.sh"
cd ..
bash runCrawler.sh

echo "waiting for report upload..."
sleep 1800


Upload-To-OSS:
name: Upload To TEST OSS
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Changes by Version
==================
Release Notes.

1.1.3
------------------
* Fixes [#153](https://github.com/HXSecurity/DongTai-agent-java/issues/153) (When using resttemplate to customize the header, some fields will not be loaded, such as the host header).
* Fixes [#159](https://github.com/HXSecurity/DongTai-agent-java/issues/159) (Third-party dependent component analysis is changed to asynchronous tasks).
* Add httpclient for Vulnerability full link tracking[#157](https://github.com/HXSecurity/DongTai-agent-java/issues/157).

All issues and pull requests are [here](https://github.com/HXSecurity/DongTai-agent-java/milestone/2)

**Contributors**

@exexute and @langligelang


------------------

Find change logs of all versions [here](changes).
16 changes: 11 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
## DongTai-agent-java
------
[中文版本(Chinese version)](README_CN.md)

[![django-project](https://img.shields.io/badge/django%20versions-3.0.3-blue)](https://www.djangoproject.com/)
[![dongtai-project](https://img.shields.io/badge/dongtai%20versions-beta-green)](https://github.com/huoxianclub/dongtai)
[![dongtai--agent--java](https://img.shields.io/badge/dongtai--agent--java-v1.0.0-lightgrey)](https://github.com/huoxianclub/dongtai-web)
[![license GPL-3.0](https://img.shields.io/github/license/HXSecurity/DongTai-agent-java)](https://github.com/HXSecurity/DongTai-agent-java/blob/main/LICENSE)
[![license Apache-2.0](https://img.shields.io/github/license/HXSecurity/DongTai-agent-java)](https://github.com/HXSecurity/DongTai-agent-java/blob/main/LICENSE)
[![GitHub stars](https://img.shields.io/github/stars/HXSecurity/DongTai-agent-java.svg?label=Stars&logo=github)](https://github.com/HXSecurity/DongTai-agent-java)
[![GitHub forks](https://img.shields.io/github/forks/HXSecurity/DongTai-Agent-Java?label=Forks&logo=github)](https://github.com/HXSecurity/DongTai-agent-java)
[![GitHub Contributors](https://img.shields.io/github/contributors-anon/HXSecurity/DongTai-agent-java?label=Contributors&logo=github)](https://github.com/HXSecurity/DongTai-agent-java)


[![CI](https://github.com/HXSecurity/DongTai-agent-java/actions/workflows/release-agent.yml/badge.svg)](https://github.com/HXSecurity/DongTai-agent-java/actions/workflows/release-agent.yml)
[![Github Version](https://img.shields.io/github/v/release/HXSecurity/DongTai-agent-java?display_name=tag&include_prereleases&sort=semver)](https://github.com/HXSecurity/DongTai-agent-java/releases)
[![Release downloads](https://shields.io/github/downloads/HXSecurity/DongTai-Agent-Java/total)](https://github.com/HXSecurity/DongTai-agent-java/releases)

- [中文版本(Chinese version)](README_CN.md)

## Project Introduction

Expand Down
17 changes: 12 additions & 5 deletions README_CN.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
## DongTai-agent-java
---
[English version](README.md)

[![license Apache-2.0](https://img.shields.io/github/license/HXSecurity/DongTai-agent-java)](https://github.com/HXSecurity/DongTai-agent-java/blob/main/LICENSE)
[![GitHub stars](https://img.shields.io/github/stars/HXSecurity/DongTai-agent-java.svg?label=Stars&logo=github)](https://github.com/HXSecurity/DongTai-agent-java)
[![GitHub forks](https://img.shields.io/github/forks/HXSecurity/DongTai-Agent-Java?label=Forks&logo=github)](https://github.com/HXSecurity/DongTai-agent-java)
[![GitHub Contributors](https://img.shields.io/github/contributors-anon/HXSecurity/DongTai-agent-java?label=Contributors&logo=github)](https://github.com/HXSecurity/DongTai-agent-java)


[![CI](https://github.com/HXSecurity/DongTai-agent-java/actions/workflows/release-agent.yml/badge.svg)](https://github.com/HXSecurity/DongTai-agent-java/actions/workflows/release-agent.yml)
[![Github Version](https://img.shields.io/github/v/release/HXSecurity/DongTai-agent-java?display_name=tag&include_prereleases&sort=semver)](https://github.com/HXSecurity/DongTai-agent-java/releases)
[![Release downloads](https://shields.io/github/downloads/HXSecurity/DongTai-Agent-Java/total)](https://github.com/HXSecurity/DongTai-agent-java/releases)

[![django-project](https://img.shields.io/badge/django%20versions-3.0.3-blue)](https://www.djangoproject.com/)
[![dongtai-project](https://img.shields.io/badge/dongtai%20versions-beta-green)](https://github.com/huoxianclub/dongtai)
[![dongtai--agent--java](https://img.shields.io/badge/dongtai--agent--java-v1.0.0-lightgrey)](https://github.com/huoxianclub/dongtai-web)
[![license GPL-3.0](https://img.shields.io/github/license/HXSecurity/DongTai-agent-java)](https://github.com/HXSecurity/DongTai-agent-java/blob/main/LICENSE)

- [English document](README.md)

## 项目介绍

Expand Down
20 changes: 20 additions & 0 deletions changes/CHANGELOG-1.1.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Changes by Version
==================
Release Notes.

1.1.3
------------------
* Fixes [#153](https://github.com/HXSecurity/DongTai-agent-java/issues/153) (When using resttemplate to customize the header, some fields will not be loaded, such as the host header).
* Fixes [#159](https://github.com/HXSecurity/DongTai-agent-java/issues/159) (Third-party dependent component analysis is changed to asynchronous tasks).
* Add httpclient for Vulnerability full link tracking[#157](https://github.com/HXSecurity/DongTai-agent-java/issues/157).

All issues and pull requests are [here](https://github.com/HXSecurity/DongTai-agent-java/milestone/2)

**Contributors**

@exexute and @langligelang


------------------

Find change logs of all versions [here](changes).
9 changes: 5 additions & 4 deletions iast-agent/src/main/resources/iast.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
iast.name=dongtai-Enterprise 1.1.1
iast.name=dongtai-Enterprise 1.1.3
iast.response.name=dongtai
iast.response.value=1.1.1
iast.server.url=https://iast.io/openapi
iast.server.token=d252c86ab74ee686690f024e0db5e301e517b084
iast.response.value=1.1.3
iast.server.url=https://iast-test.huoxian.cn/openapi
iast.server.token=0f0025dff8311467f6da5b5109a469f1831aa782
iast.allhook.enable=false
iast.dump.class.enable=false
iast.dump.class.path=/tmp/iast-class-dump/
Expand All @@ -18,3 +18,4 @@ iast.proxy.enable=false
iast.proxy.host=
iast.proxy.port=
response.length=
iast.server.mode=local