Skip to content

Count Messages for Spider and Active Scanner #4

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.

Sign up for GitHub

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

Open
Harinus wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Count Messages for Spider and Active Scanner #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba00c2e
Set methods to public
Harinus Nov 26, 2015
8d48aaf
Set methods to public
Harinus Nov 26, 2015
ae42491
Method to access the next unique Session ID
Harinus Nov 26, 2015
abde481
Merge pull request #1 from Harinus/Fix-#2080
Harinus Jan 20, 2016
59d76ba
Count Messages for Spider and Active Scanner
Harinus Jan 20, 2016
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
7 changes: 3 additions & 4 deletions src/org/zaproxy/zap/extension/httpsessions/ExtensionHttpSessions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ protected HttpSessionsPanel getHttpSessionsPanel() {
* missing, a default protocol of 80 is used.
* @return the http sessions site container
*/
protected HttpSessionsSite getHttpSessionsSite(String site) {
public HttpSessionsSite getHttpSessionsSite(String site) {
return getHttpSessionsSite(site, true);
}

Expand All @@ -467,7 +467,7 @@ protected HttpSessionsSite getHttpSessionsSite(String site) {
* false
*
*/
protected HttpSessionsSite getHttpSessionsSite(String site, boolean createIfNeeded) {
public HttpSessionsSite getHttpSessionsSite(String site, boolean createIfNeeded) {
// Add a default port
if (!site.contains(":")) {
site = site + (":80");
Expand Down Expand Up @@ -607,8 +607,7 @@ public void onHttpRequestSend(HttpMessage msg, int initiator, HttpSender sender)

@Override
public void onHttpResponseReceive(HttpMessage msg, int initiator, HttpSender sender) {
if (initiator == HttpSender.ACTIVE_SCANNER_INITIATOR || initiator == HttpSender.SPIDER_INITIATOR
|| initiator == HttpSender.CHECK_FOR_UPDATES_INITIATOR) {
if (initiator == HttpSender.CHECK_FOR_UPDATES_INITIATOR) {
// Not a session we care about
return;
}
Expand Down
8 changes: 6 additions & 2 deletions src/org/zaproxy/zap/extension/httpsessions/HttpSessionsSite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ protected void cleanupSessionToken(String token) {
*
* @return the http sessions
*/
protected Set<HttpSession> getHttpSessions() {
public Set<HttpSession> getHttpSessions() {
synchronized (this.sessions) {
return Collections.unmodifiableSet(sessions);
}
Expand All @@ -579,7 +579,7 @@ protected Set<HttpSession> getHttpSessions() {
* @param name the name
* @return the http session with a given name, or null, if no such session exists
*/
protected HttpSession getHttpSession(String name) {
public HttpSession getHttpSession(String name) {
synchronized (this.sessions) {
for (HttpSession session : sessions) {
if (session.getName().equals(name)) {
Expand Down Expand Up @@ -626,4 +626,8 @@ public boolean renameHttpSession(String oldName, String newName) {
static void resetLastGeneratedSessionId() {
lastGeneratedSessionID = 0;
}

public static int getNextSessionId() {
return lastGeneratedSessionID++;
}
}