Skip to content

Commit

Permalink
Merge pull request #39 from Ostorlab/fix/update_references_to_docs
Browse files Browse the repository at this point in the history
Update references to OXO
  • Loading branch information
3asm authored Mar 18, 2024
2 parents 4090efd + 6226d61 commit fa4578d
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 23 deletions.
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,38 +15,38 @@ _Whatweb is a web technology fingerprinter capable of detecting CMS, blogging pl
<img src="https://github.com/Ostorlab/agent_whatweb/blob/main/images/logo.png" alt="agent-whatweb" />
</p>

This repository is an implementation of [Ostorlab Agent](https://pypi.org/project/ostorlab/) for the [Whatweb Fingerprinter](https://github.com/urbanadventurer/WhatWeb.git).
This repository is an implementation of [OXO Agent](https://pypi.org/project/ostorlab/) for the [Whatweb Fingerprinter](https://github.com/urbanadventurer/WhatWeb.git).

## Getting Started
To perform your first scan, simply run the following command.
```shell
ostorlab scan run --install --agent agent/ostorlab/whatweb domain-name tesla.com
oxo scan run --install --agent agent/ostorlab/whatweb domain-name tesla.com
```

This command will download and install `agent/ostorlab/whatweb`.
For more information, please refer to the [Ostorlab Documentation](https://github.com/Ostorlab/ostorlab/blob/main/README.md)
For more information, please refer to the [OXO Documentation](https://oxo.ostorlab.co/docs)


## Usage

Agent Whatweb can be installed directly from the ostorlab agent store or built from this repository.
Agent Whatweb can be installed directly from the oxo agent store or built from this repository.

### Install directly from ostorlab agent store
### Install directly from oxo agent store

```shell
ostorlab agent install agent/ostorlab/whatweb
oxo agent install agent/ostorlab/whatweb
```

You can then run the agent with the following command:

```shell
ostorlab scan run --agent agent/ostorlab/whatweb domain-name tesla.com
oxo scan run --agent agent/ostorlab/whatweb domain-name tesla.com
```


### Build directly from the repository

1. To build the whatweb agent you need to have [ostorlab](https://pypi.org/project/ostorlab/) installed in your machine. if you have already installed ostorlab, you can skip this step.
1. To build the whatweb agent you need to have [oxo](https://pypi.org/project/ostorlab/) installed in your machine. If you have already installed oxo, you can skip this step.

```shell
pip3 install ostorlab
Expand All @@ -58,21 +58,21 @@ pip3 install ostorlab
git clone https://github.com/Ostorlab/agent_whatweb.git && cd agent_whatweb
```

3. Build the agent image using ostorlab cli.
3. Build the agent image using oxo cli.

```shell
ostortlab agent build --file=ostorlab.yaml
oxo agent build --file=ostorlab.yaml
```
You can pass the optional flag `--organization` to specify your organisation. The organization is empty by default.

1. Run the agent using on of the following commands:
* If you did not specify an organization when building the image:
```shell
ostorlab scan run --agent agent//whatweb domain-name tesla.com
oxo scan run --agent agent//whatweb domain-name tesla.com
```
* If you specified an organization when building the image:
```shell
ostorlab scan run --agent agent/[ORGANIZATION]/whatweb domain-name tesla.com
oxo scan run --agent agent/[ORGANIZATION]/whatweb domain-name tesla.com
```


Expand Down
1 change: 1 addition & 0 deletions agent/whatweb_agent.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""WhatWeb Agent: Agent responsible for finger-printing a website."""

import abc
import dataclasses
import io
Expand Down
20 changes: 10 additions & 10 deletions ostorlab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description: |
## Getting Started
To perform your first scan, simply run the following command.
```shell
ostorlab scan run --install --agent agent/ostorlab/whatweb domain-name tesla.com
oxo scan run --install --agent agent/ostorlab/whatweb domain-name tesla.com
```
This command will download and install `agent/ostorlab/whatweb`.
Expand All @@ -17,24 +17,24 @@ description: |
## Usage
Agent WhatWeb can be installed directly from the ostorlab agent store or built from this repository.
Agent WhatWeb can be installed directly from the oxo agent store or built from this repository.
### Install directly from ostorlab agent store
### Install directly from oxo agent store
```shell
ostorlab agent install agent/ostorlab/whatweb
oxo agent install agent/ostorlab/whatweb
```
You can then run the agent with the following command:

```shell
ostorlab scan run --agent agent/ostorlab/whatweb domain-name tesla.com
oxo scan run --agent agent/ostorlab/whatweb domain-name tesla.com
```


### Build directly from the repository

1. To build the whatweb agent you need to have [ostorlab](https://pypi.org/project/ostorlab/) installed in your machine. if you have already installed ostorlab, you can skip this step.
1. To build the whatweb agent you need to have [oxo](https://pypi.org/project/ostorlab/) installed in your machine. If you have already installed oxo, you can skip this step.

```shell
pip3 install ostorlab
Expand All @@ -46,21 +46,21 @@ description: |
git clone https://github.com/Ostorlab/agent_whatweb.git && cd agent_whatweb
```

3. Build the agent image using ostorlab cli.
3. Build the agent image using oxo cli.

```shell
ostorlab agent build --file=ostorlab.yaml
oxo agent build --file=ostorlab.yaml
```
You can pass the optional flag `--organization` to specify your organisation. The organization is empty by default.

1. Run the agent using on of the following commands:
* If you did not specify an organization when building the image:
```shell
ostorlab scan run --agent agent//whatweb domain-name tesla.com
oxo scan run --agent agent//whatweb domain-name tesla.com
```
* If you specified an organization when building the image:
```shell
ostorlab scan run --agent agent/[ORGANIZATION]/whatweb domain-name tesla.com
oxo scan run --agent agent/[ORGANIZATION]/whatweb domain-name tesla.com
```


Expand Down
2 changes: 1 addition & 1 deletion requirement.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ostorlab[agent]
rich
rich
1 change: 1 addition & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Pytest fixture for the whatweb agent."""

import pytest
import json
import pathlib
Expand Down
1 change: 1 addition & 0 deletions tests/whatweb_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Unittests for whatweb agent."""

import pathlib
import subprocess
import tempfile
Expand Down

0 comments on commit fa4578d

Please sign in to comment.