Skip to content

Allow passing null userAgent. #10

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
artur-tamazian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow passing null userAgent. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/com/optimaize/webcrawlerverifier/DefaultKnownCrawlerDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public DefaultKnownCrawlerDetector(@NotNull List<KnownHostBotVerifier> verifiers

@NotNull
@Override
public Optional<KnownCrawlerResult> detect(@NotNull String userAgent, @NotNull String ip) {
public Optional<KnownCrawlerResult> detect(String userAgent, @NotNull String ip) {
for (KnownHostBotVerifier verifier : verifiers) {
BotCheckerResult check = verifier.check(userAgent, ip);
if (check != BotCheckerResult.IS_NOT) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/optimaize/webcrawlerverifier/KnownCrawlerDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ public interface KnownCrawlerDetector {
* @return absent if none detected.
*/
@NotNull
Optional<KnownCrawlerResult> detect(@NotNull String userAgent, @NotNull String ip);
Optional<KnownCrawlerResult> detect(String userAgent, @NotNull String ip);

}
2 changes: 1 addition & 1 deletion src/main/java/com/optimaize/webcrawlerverifier/bots/KnownHostBotVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ public interface KnownHostBotVerifier {
* @return
*/
@NotNull
BotCheckerResult check(@NotNull String userAgent, @NotNull String ip);
BotCheckerResult check(String userAgent, @NotNull String ip);

}
6 changes: 4 additions & 2 deletions src/main/java/com/optimaize/webcrawlerverifier/bots/KnownHostBotVerifierImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

import java.util.Set;

import static com.google.common.base.Strings.isNullOrEmpty;

/**
*
*/
Expand Down Expand Up @@ -38,8 +40,8 @@ public String getIdentifier() {

@Override
@NotNull
public BotCheckerResult check(@NotNull String userAgent, @NotNull String ip) {
if (!crawlerData.getUserAgentChecker().apply(userAgent)) {
public BotCheckerResult check(String userAgent, @NotNull String ip) {
if (isNullOrEmpty(userAgent) || !crawlerData.getUserAgentChecker().apply(userAgent)) {
return BotCheckerResult.IS_NOT;
} else {
Set<String> permittedIps = crawlerData.getIps();
Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/optimaize/webcrawlerverifier/DefaultKnownCrawlerDetectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class DefaultKnownCrawlerDetectorTest {
public void none() throws Exception {
DefaultKnownCrawlerDetector detector = all();
assertFalse(detector.detect("", "127.0.0.1").isPresent());
assertFalse(detector.detect(null, "127.0.0.1").isPresent());
}

/**
Expand Down