mirror of
https://github.com/neon-mmd/websurfx.git
synced 2024-11-22 14:08:23 -05:00
Merge branch 'rolling' into reorganize-code-and-restructure-the-codebase
This commit is contained in:
commit
ca4447fcdf
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ package-lock.json
|
|||||||
dump.rdb
|
dump.rdb
|
||||||
.vscode
|
.vscode
|
||||||
megalinter-reports/
|
megalinter-reports/
|
||||||
|
dhat-heap.json
|
||||||
|
476
Cargo.lock
generated
476
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
24
Cargo.toml
24
Cargo.toml
@ -8,9 +8,9 @@ license = "AGPL-3.0"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
reqwest = {version="0.11.20",features=["json"]}
|
reqwest = {version="0.11.20",features=["json"]}
|
||||||
tokio = {version="1.32.0",features=["full"]}
|
tokio = {version="1.32.0",features=["rt-multi-thread","macros"]}
|
||||||
serde = {version="1.0.188",features=["derive"]}
|
serde = {version="1.0.188",features=["derive"]}
|
||||||
handlebars = { version = "4.3.7", features = ["dir_source"] }
|
handlebars = { version = "4.4.0", features = ["dir_source"] }
|
||||||
scraper = {version="0.17.1"}
|
scraper = {version="0.17.1"}
|
||||||
actix-web = {version="4.4.0", features = ["cookies"]}
|
actix-web = {version="4.4.0", features = ["cookies"]}
|
||||||
actix-files = {version="0.6.2"}
|
actix-files = {version="0.6.2"}
|
||||||
@ -19,14 +19,20 @@ serde_json = {version="1.0.105"}
|
|||||||
fake-useragent = {version="0.1.3"}
|
fake-useragent = {version="0.1.3"}
|
||||||
env_logger = {version="0.10.0"}
|
env_logger = {version="0.10.0"}
|
||||||
log = {version="0.4.20"}
|
log = {version="0.4.20"}
|
||||||
rlua = {version="0.19.7"}
|
mlua = {version="0.8.10", features=["luajit"]}
|
||||||
redis = {version="0.23.2"}
|
redis = {version="0.23.3", features=["tokio-comp","connection-manager"]}
|
||||||
md5 = {version="0.7.0"}
|
md5 = {version="0.7.0"}
|
||||||
rand={version="0.8.5"}
|
rand={version="0.8.5"}
|
||||||
once_cell = {version="1.18.0"}
|
once_cell = {version="1.18.0"}
|
||||||
error-stack = {version="0.4.0"}
|
error-stack = {version="0.4.0"}
|
||||||
async-trait = {version="0.1.73"}
|
async-trait = {version="0.1.73"}
|
||||||
regex = {version="1.9.4", features=["perf"]}
|
regex = {version="1.9.4", features=["perf"]}
|
||||||
|
smallvec = {version="1.11.0", features=["union", "serde"]}
|
||||||
|
futures = {version="0.3.28"}
|
||||||
|
dhat = {version="0.3.2", optional = true}
|
||||||
|
mimalloc = { version = "0.1.38", default-features = false }
|
||||||
|
async-once-cell = {version="0.5.3"}
|
||||||
|
actix-governor = {version="0.4.1"}
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
rusty-hook = "^0.11.2"
|
rusty-hook = "^0.11.2"
|
||||||
@ -47,13 +53,17 @@ rpath = false
|
|||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
opt-level = 3
|
opt-level = 3
|
||||||
debug = false
|
debug = false # This should only be commented when testing with dhat profiler
|
||||||
|
# debug = 1 # This should only be uncommented when testing with dhat profiler
|
||||||
split-debuginfo = '...'
|
split-debuginfo = '...'
|
||||||
debug-assertions = false
|
debug-assertions = false
|
||||||
overflow-checks = false
|
overflow-checks = false
|
||||||
lto = 'thin'
|
lto = true
|
||||||
panic = 'abort'
|
panic = 'abort'
|
||||||
incremental = false
|
incremental = false
|
||||||
codegen-units = 16
|
codegen-units = 1
|
||||||
rpath = false
|
rpath = false
|
||||||
strip = "debuginfo"
|
strip = "debuginfo"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
dhat-heap = ["dep:dhat"]
|
||||||
|
@ -19,7 +19,7 @@ COPY . .
|
|||||||
RUN cargo install --path .
|
RUN cargo install --path .
|
||||||
|
|
||||||
# We do not need the Rust toolchain to run the binary!
|
# We do not need the Rust toolchain to run the binary!
|
||||||
FROM gcr.io/distroless/cc-debian11
|
FROM gcr.io/distroless/cc-debian12
|
||||||
COPY --from=builder /app/public/ /opt/websurfx/public/
|
COPY --from=builder /app/public/ /opt/websurfx/public/
|
||||||
COPY --from=builder /app/websurfx/config.lua /etc/xdg/websurfx/config.lua
|
COPY --from=builder /app/websurfx/config.lua /etc/xdg/websurfx/config.lua
|
||||||
COPY --from=builder /usr/local/cargo/bin/* /usr/local/bin/
|
COPY --from=builder /usr/local/cargo/bin/* /usr/local/bin/
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<b align="center"><a href="README.md">Readme</a></b> |
|
<b align="center"><a href="README.md">Readme</a></b> |
|
||||||
<b><a href="https://discord.gg/SWnda7Mw5u">Discord</a></b> |
|
<b><a href="https://discord.gg/SWnda7Mw5u">Discord</a></b> |
|
||||||
<b><a href="https://github.com/neon-mmd/websurfx">GitHub</a></b> |
|
<b><a href="https://github.com/neon-mmd/websurfx">GitHub</a></b> |
|
||||||
<b><a href="./docs/README.md">Documentation</a></b>
|
<b><a href="../../tree/HEAD/docs/">Documentation</a></b>
|
||||||
<br /><br />
|
<br /><br />
|
||||||
<a href="#">
|
<a href="#">
|
||||||
<img
|
<img
|
||||||
@ -51,7 +51,7 @@
|
|||||||
- **Getting Started**
|
- **Getting Started**
|
||||||
- [🔭 Preview](#preview-)
|
- [🔭 Preview](#preview-)
|
||||||
- [🚀 Features](#features-)
|
- [🚀 Features](#features-)
|
||||||
- [🛠️ Installation and Testing](#installation-and-testing-)
|
- [🛠️ Installation and Testing](#installation-and-testing-%EF%B8%8F)
|
||||||
- [🔧 Configuration](#configuration-)
|
- [🔧 Configuration](#configuration-)
|
||||||
- **Feature Overview**
|
- **Feature Overview**
|
||||||
- [🎨 Theming](#theming-)
|
- [🎨 Theming](#theming-)
|
||||||
|
@ -109,7 +109,7 @@ colorscheme = "catppuccin-mocha" -- the colorscheme name which should be used fo
|
|||||||
theme = "simple" -- the theme name which should be used for the website
|
theme = "simple" -- the theme name which should be used for the website
|
||||||
|
|
||||||
-- ### Caching ###
|
-- ### Caching ###
|
||||||
redis_connection_url = "redis://redis:6379" -- redis connection url address on which the client should connect on.
|
redis_url = "redis://redis:6379" -- redis connection url address on which the client should connect on.
|
||||||
|
|
||||||
-- ### Search Engines ###
|
-- ### Search Engines ###
|
||||||
upstream_search_engines = { DuckDuckGo = true, Searx = false } -- select the upstream search engines from which the results should be fetched.
|
upstream_search_engines = { DuckDuckGo = true, Searx = false } -- select the upstream search engines from which the results should be fetched.
|
||||||
|
BIN
public/images/barricade.png
Normal file
BIN
public/images/barricade.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 892 KiB |
BIN
public/images/filter.png
Normal file
BIN
public/images/filter.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 102 KiB |
@ -132,6 +132,35 @@ body {
|
|||||||
width: 1.2rem;
|
width: 1.2rem;
|
||||||
height: 1.2rem;
|
height: 1.2rem;
|
||||||
}
|
}
|
||||||
|
.results .result_disallowed,
|
||||||
|
.results .result_filtered {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10rem;
|
||||||
|
font-size: 2rem;
|
||||||
|
color: var(--foreground-color);
|
||||||
|
margin: 0rem 7rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.results .result_disallowed .user_query,
|
||||||
|
.results .result_filtered .user_query {
|
||||||
|
color: var(--background-color);
|
||||||
|
font-weight: 300;
|
||||||
|
}
|
||||||
|
|
||||||
|
.results .result_disallowed img,
|
||||||
|
.results .result_filtered img {
|
||||||
|
width: 30rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.results .result_disallowed div,
|
||||||
|
.results .result_filtered div {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1rem;
|
||||||
|
line-break: strict;
|
||||||
|
}
|
||||||
|
|
||||||
/* styles for the footer and header */
|
/* styles for the footer and header */
|
||||||
|
|
||||||
|
@ -1,37 +1,69 @@
|
|||||||
{{>header this.style}}
|
{{>header this.style}}
|
||||||
<main class="results">
|
<main class="results">
|
||||||
{{>search_bar this}}
|
{{>search_bar this}}
|
||||||
<div class="results_aggregated">
|
<div class="results_aggregated">
|
||||||
{{#if results}} {{#each results}}
|
{{#if results}} {{#each results}}
|
||||||
<div class="result">
|
<div class="result">
|
||||||
<h1><a href="{{{this.url}}}">{{{this.title}}}</a></h1>
|
<h1><a href="{{{this.url}}}">{{{this.title}}}</a></h1>
|
||||||
<small>{{{this.url}}}</small>
|
<small>{{{this.url}}}</small>
|
||||||
<p>{{{this.description}}}</p>
|
<p>{{{this.description}}}</p>
|
||||||
<div class="upstream_engines">
|
<div class="upstream_engines">
|
||||||
{{#each engine}}
|
{{#each engine}}
|
||||||
<span>{{{this}}}</span>
|
<span>{{{this}}}</span>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
{{/each}} {{else}} {{#if disallowed}}
|
||||||
|
<div class="result_disallowed">
|
||||||
|
<div class="description">
|
||||||
|
<p>
|
||||||
|
Your search - <span class="user_query">{{{this.pageQuery}}}</span> -
|
||||||
|
has been disallowed.
|
||||||
|
</p>
|
||||||
|
<p class="description_paragraph">Dear user,</p>
|
||||||
|
<p class="description_paragraph">
|
||||||
|
The query - <span class="user_query">{{{this.pageQuery}}}</span> - has
|
||||||
|
been blacklisted via server configuration and hence disallowed by the
|
||||||
|
server. Henceforth no results could be displayed for your query.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<img src="./images/barricade.png" alt="Image of a Barricade" />
|
||||||
|
</div>
|
||||||
|
{{else}} {{#if filtered}}
|
||||||
|
<div class="result_filtered">
|
||||||
|
<div class="description">
|
||||||
|
<p>
|
||||||
|
Your search - <span class="user_query">{{{this.pageQuery}}}</span> -
|
||||||
|
has been filtered.
|
||||||
|
</p>
|
||||||
|
<p class="description_paragraph">Dear user,</p>
|
||||||
|
<p class="description_paragraph">
|
||||||
|
All the search results contain results that has been configured to be
|
||||||
|
filtered out via server configuration and henceforth has been
|
||||||
|
completely filtered out.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<img src="./images/filter.png" alt="Image of a paper inside a funnel" />
|
||||||
|
</div>
|
||||||
|
{{else}}
|
||||||
|
<div class="result_not_found">
|
||||||
|
<p>Your search - {{{this.pageQuery}}} - did not match any documents.</p>
|
||||||
|
<p class="suggestions">Suggestions:</p>
|
||||||
|
<ul>
|
||||||
|
<li>Make sure that all words are spelled correctly.</li>
|
||||||
|
<li>Try different keywords.</li>
|
||||||
|
<li>Try more general keywords.</li>
|
||||||
|
</ul>
|
||||||
|
<img src="./images/no_results.gif" alt="Man fishing gif" />
|
||||||
|
</div>
|
||||||
|
{{/if}} {{/if}} {{/if}}
|
||||||
</div>
|
</div>
|
||||||
{{/each}} {{else}}
|
<div class="page_navigation">
|
||||||
<div class="result_not_found">
|
<button type="button" onclick="navigate_backward()">
|
||||||
<p>Your search - {{{this.pageQuery}}} - did not match any documents.</p>
|
← previous
|
||||||
<p class="suggestions">Suggestions:</p>
|
</button>
|
||||||
<ul>
|
<button type="button" onclick="navigate_forward()">next →</button>
|
||||||
<li>Make sure that all words are spelled correctly.</li>
|
|
||||||
<li>Try different keywords.</li>
|
|
||||||
<li>Try more general keywords.</li>
|
|
||||||
</ul>
|
|
||||||
<img src="./images/no_results.gif" alt="Man fishing gif" />
|
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
|
||||||
</div>
|
|
||||||
<div class="page_navigation">
|
|
||||||
<button type="button" onclick="navigate_backward()">
|
|
||||||
← previous
|
|
||||||
</button>
|
|
||||||
<button type="button" onclick="navigate_forward()">next →</button>
|
|
||||||
</div>
|
|
||||||
</main>
|
</main>
|
||||||
<script src="static/index.js"></script>
|
<script src="static/index.js"></script>
|
||||||
<script src="static/pagination.js"></script>
|
<script src="static/pagination.js"></script>
|
||||||
|
@ -3,9 +3,19 @@
|
|||||||
//! This module contains the main function which handles the logging of the application to the
|
//! This module contains the main function which handles the logging of the application to the
|
||||||
//! stdout and handles the command line arguments provided and launches the `websurfx` server.
|
//! stdout and handles the command line arguments provided and launches the `websurfx` server.
|
||||||
|
|
||||||
|
use mimalloc::MiMalloc;
|
||||||
use std::net::TcpListener;
|
use std::net::TcpListener;
|
||||||
use websurfx::{config::parser::Config, run};
|
use websurfx::{config::parser::Config, run};
|
||||||
|
|
||||||
|
/// A dhat heap memory profiler
|
||||||
|
#[cfg(feature = "dhat-heap")]
|
||||||
|
#[global_allocator]
|
||||||
|
static ALLOC: dhat::Alloc = dhat::Alloc;
|
||||||
|
|
||||||
|
#[cfg(not(feature = "dhat-heap"))]
|
||||||
|
#[global_allocator]
|
||||||
|
static GLOBAL: MiMalloc = MiMalloc;
|
||||||
|
|
||||||
/// The function that launches the main server and registers all the routes of the website.
|
/// The function that launches the main server and registers all the routes of the website.
|
||||||
///
|
///
|
||||||
/// # Error
|
/// # Error
|
||||||
@ -14,6 +24,10 @@ use websurfx::{config::parser::Config, run};
|
|||||||
/// available for being used for other applications.
|
/// available for being used for other applications.
|
||||||
#[actix_web::main]
|
#[actix_web::main]
|
||||||
async fn main() -> std::io::Result<()> {
|
async fn main() -> std::io::Result<()> {
|
||||||
|
// A dhat heap profiler initialization.
|
||||||
|
#[cfg(feature = "dhat-heap")]
|
||||||
|
let _profiler = dhat::Profiler::new_heap();
|
||||||
|
|
||||||
// Initialize the parsed config file.
|
// Initialize the parsed config file.
|
||||||
let config = Config::parse(false).unwrap();
|
let config = Config::parse(false).unwrap();
|
||||||
|
|
||||||
|
127
src/cache/cacher.rs
vendored
127
src/cache/cacher.rs
vendored
@ -1,14 +1,24 @@
|
|||||||
//! This module provides the functionality to cache the aggregated results fetched and aggregated
|
//! This module provides the functionality to cache the aggregated results fetched and aggregated
|
||||||
//! from the upstream search engines in a json format.
|
//! from the upstream search engines in a json format.
|
||||||
|
|
||||||
|
use error_stack::Report;
|
||||||
|
use futures::future::try_join_all;
|
||||||
use md5::compute;
|
use md5::compute;
|
||||||
use redis::{Client, Commands, Connection};
|
use redis::{aio::ConnectionManager, AsyncCommands, Client, RedisError};
|
||||||
|
|
||||||
|
use super::error::PoolError;
|
||||||
|
|
||||||
/// A named struct which stores the redis Connection url address to which the client will
|
/// A named struct which stores the redis Connection url address to which the client will
|
||||||
/// connect to.
|
/// connect to.
|
||||||
|
#[derive(Clone)]
|
||||||
pub struct RedisCache {
|
pub struct RedisCache {
|
||||||
/// It stores the redis Connection url address.
|
/// It stores a pool of connections ready to be used.
|
||||||
connection: Connection,
|
connection_pool: Vec<ConnectionManager>,
|
||||||
|
/// It stores the size of the connection pool (in other words the number of
|
||||||
|
/// connections that should be stored in the pool).
|
||||||
|
pool_size: u8,
|
||||||
|
/// It stores the index of which connection is being used at the moment.
|
||||||
|
current_connection: u8,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl RedisCache {
|
impl RedisCache {
|
||||||
@ -16,11 +26,25 @@ impl RedisCache {
|
|||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
///
|
///
|
||||||
/// * `redis_connection_url` - It stores the redis Connection url address.
|
/// * `redis_connection_url` - It takes the redis Connection url address.
|
||||||
pub fn new(redis_connection_url: String) -> Result<Self, Box<dyn std::error::Error>> {
|
/// * `pool_size` - It takes the size of the connection pool (in other words the number of
|
||||||
|
/// connections that should be stored in the pool).
|
||||||
|
pub async fn new(
|
||||||
|
redis_connection_url: &str,
|
||||||
|
pool_size: u8,
|
||||||
|
) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
let client = Client::open(redis_connection_url)?;
|
let client = Client::open(redis_connection_url)?;
|
||||||
let connection = client.get_connection()?;
|
let mut tasks: Vec<_> = Vec::new();
|
||||||
let redis_cache = RedisCache { connection };
|
|
||||||
|
for _ in 0..pool_size {
|
||||||
|
tasks.push(client.get_tokio_connection_manager());
|
||||||
|
}
|
||||||
|
|
||||||
|
let redis_cache = RedisCache {
|
||||||
|
connection_pool: try_join_all(tasks).await?,
|
||||||
|
pool_size,
|
||||||
|
current_connection: Default::default(),
|
||||||
|
};
|
||||||
Ok(redis_cache)
|
Ok(redis_cache)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -29,7 +53,7 @@ impl RedisCache {
|
|||||||
/// # Arguments
|
/// # Arguments
|
||||||
///
|
///
|
||||||
/// * `url` - It takes an url as string.
|
/// * `url` - It takes an url as string.
|
||||||
fn hash_url(url: &str) -> String {
|
fn hash_url(&self, url: &str) -> String {
|
||||||
format!("{:?}", compute(url))
|
format!("{:?}", compute(url))
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -38,9 +62,42 @@ impl RedisCache {
|
|||||||
/// # Arguments
|
/// # Arguments
|
||||||
///
|
///
|
||||||
/// * `url` - It takes an url as a string.
|
/// * `url` - It takes an url as a string.
|
||||||
pub fn cached_json(&mut self, url: &str) -> Result<String, Box<dyn std::error::Error>> {
|
pub async fn cached_json(&mut self, url: &str) -> Result<String, Report<PoolError>> {
|
||||||
let hashed_url_string = Self::hash_url(url);
|
self.current_connection = Default::default();
|
||||||
Ok(self.connection.get(hashed_url_string)?)
|
let hashed_url_string: &str = &self.hash_url(url);
|
||||||
|
|
||||||
|
let mut result: Result<String, RedisError> = self.connection_pool
|
||||||
|
[self.current_connection as usize]
|
||||||
|
.get(hashed_url_string)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
// Code to check whether the current connection being used is dropped with connection error
|
||||||
|
// or not. if it drops with the connection error then the current connection is replaced
|
||||||
|
// with a new connection from the pool which is then used to run the redis command then
|
||||||
|
// that connection is also checked whether it is dropped or not if it is not then the
|
||||||
|
// result is passed as a `Result` or else the same process repeats again and if all of the
|
||||||
|
// connections in the pool result in connection drop error then a custom pool error is
|
||||||
|
// returned.
|
||||||
|
loop {
|
||||||
|
match result {
|
||||||
|
Err(error) => match error.is_connection_dropped() {
|
||||||
|
true => {
|
||||||
|
self.current_connection += 1;
|
||||||
|
if self.current_connection == self.pool_size {
|
||||||
|
return Err(Report::new(
|
||||||
|
PoolError::PoolExhaustionWithConnectionDropError,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
result = self.connection_pool[self.current_connection as usize]
|
||||||
|
.get(hashed_url_string)
|
||||||
|
.await;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
false => return Err(Report::new(PoolError::RedisError(error))),
|
||||||
|
},
|
||||||
|
Ok(res) => return Ok(res),
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A function which caches the results by using the hashed `url` as the key and
|
/// A function which caches the results by using the hashed `url` as the key and
|
||||||
@ -51,21 +108,45 @@ impl RedisCache {
|
|||||||
///
|
///
|
||||||
/// * `json_results` - It takes the json results string as an argument.
|
/// * `json_results` - It takes the json results string as an argument.
|
||||||
/// * `url` - It takes the url as a String.
|
/// * `url` - It takes the url as a String.
|
||||||
pub fn cache_results(
|
pub async fn cache_results(
|
||||||
&mut self,
|
&mut self,
|
||||||
json_results: String,
|
json_results: &str,
|
||||||
url: &str,
|
url: &str,
|
||||||
) -> Result<(), Box<dyn std::error::Error>> {
|
) -> Result<(), Report<PoolError>> {
|
||||||
let hashed_url_string = Self::hash_url(url);
|
self.current_connection = Default::default();
|
||||||
|
let hashed_url_string: &str = &self.hash_url(url);
|
||||||
|
|
||||||
// put results_json into cache
|
let mut result: Result<(), RedisError> = self.connection_pool
|
||||||
self.connection.set(&hashed_url_string, json_results)?;
|
[self.current_connection as usize]
|
||||||
|
.set_ex(hashed_url_string, json_results, 60)
|
||||||
|
.await;
|
||||||
|
|
||||||
// Set the TTL for the key to 60 seconds
|
// Code to check whether the current connection being used is dropped with connection error
|
||||||
self.connection
|
// or not. if it drops with the connection error then the current connection is replaced
|
||||||
.expire::<String, u32>(hashed_url_string, 60)
|
// with a new connection from the pool which is then used to run the redis command then
|
||||||
.unwrap();
|
// that connection is also checked whether it is dropped or not if it is not then the
|
||||||
|
// result is passed as a `Result` or else the same process repeats again and if all of the
|
||||||
Ok(())
|
// connections in the pool result in connection drop error then a custom pool error is
|
||||||
|
// returned.
|
||||||
|
loop {
|
||||||
|
match result {
|
||||||
|
Err(error) => match error.is_connection_dropped() {
|
||||||
|
true => {
|
||||||
|
self.current_connection += 1;
|
||||||
|
if self.current_connection == self.pool_size {
|
||||||
|
return Err(Report::new(
|
||||||
|
PoolError::PoolExhaustionWithConnectionDropError,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
result = self.connection_pool[self.current_connection as usize]
|
||||||
|
.set_ex(hashed_url_string, json_results, 60)
|
||||||
|
.await;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
false => return Err(Report::new(PoolError::RedisError(error))),
|
||||||
|
},
|
||||||
|
Ok(_) => return Ok(()),
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
37
src/cache/error.rs
vendored
Normal file
37
src/cache/error.rs
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
//! This module provides the error enum to handle different errors associated while requesting data from
|
||||||
|
//! the redis server using an async connection pool.
|
||||||
|
use std::fmt;
|
||||||
|
|
||||||
|
use redis::RedisError;
|
||||||
|
|
||||||
|
/// A custom error type used for handling redis async pool associated errors.
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum PoolError {
|
||||||
|
/// This variant handles all errors related to `RedisError`,
|
||||||
|
RedisError(RedisError),
|
||||||
|
/// This variant handles the errors which occurs when all the connections
|
||||||
|
/// in the connection pool return a connection dropped redis error.
|
||||||
|
PoolExhaustionWithConnectionDropError,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for PoolError {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
PoolError::RedisError(redis_error) => {
|
||||||
|
if let Some(detail) = redis_error.detail() {
|
||||||
|
write!(f, "{}", detail)
|
||||||
|
} else {
|
||||||
|
write!(f, "")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PoolError::PoolExhaustionWithConnectionDropError => {
|
||||||
|
write!(
|
||||||
|
f,
|
||||||
|
"Error all connections from the pool dropped with connection error"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl error_stack::Context for PoolError {}
|
1
src/cache/mod.rs
vendored
1
src/cache/mod.rs
vendored
@ -2,3 +2,4 @@
|
|||||||
//! results fetched and aggregated from the upstream search engines in a json format.
|
//! results fetched and aggregated from the upstream search engines in a json format.
|
||||||
|
|
||||||
pub mod cacher;
|
pub mod cacher;
|
||||||
|
pub mod error;
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
|
|
||||||
use crate::handler::paths::{file_path, FileType};
|
use crate::handler::paths::{file_path, FileType};
|
||||||
|
|
||||||
use crate::models::parser_models::Style;
|
use crate::models::parser_models::{AggregatorConfig, RateLimiter, Style};
|
||||||
use log::LevelFilter;
|
use log::LevelFilter;
|
||||||
use rlua::Lua;
|
use mlua::Lua;
|
||||||
use std::{collections::HashMap, fs, thread::available_parallelism};
|
use std::{collections::HashMap, fs, thread::available_parallelism};
|
||||||
|
|
||||||
/// A named struct which stores the parsed config file options.
|
/// A named struct which stores the parsed config file options.
|
||||||
@ -32,14 +32,11 @@ pub struct Config {
|
|||||||
pub request_timeout: u8,
|
pub request_timeout: u8,
|
||||||
/// It stores the number of threads which controls the app will use to run.
|
/// It stores the number of threads which controls the app will use to run.
|
||||||
pub threads: u8,
|
pub threads: u8,
|
||||||
}
|
/// It stores configuration options for the ratelimiting middleware.
|
||||||
|
pub rate_limiter: RateLimiter,
|
||||||
/// Configuration options for the aggregator.
|
/// It stores the level of safe search to be used for restricting content in the
|
||||||
#[derive(Clone)]
|
/// search results.
|
||||||
pub struct AggregatorConfig {
|
pub safe_search: u8,
|
||||||
/// It stores the option to whether enable or disable random delays between
|
|
||||||
/// requests.
|
|
||||||
pub random_delay: bool,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Config {
|
impl Config {
|
||||||
@ -57,53 +54,70 @@ impl Config {
|
|||||||
/// or io error if the config.lua file doesn't exists otherwise it returns a newly constructed
|
/// or io error if the config.lua file doesn't exists otherwise it returns a newly constructed
|
||||||
/// Config struct with all the parsed config options from the parsed config file.
|
/// Config struct with all the parsed config options from the parsed config file.
|
||||||
pub fn parse(logging_initialized: bool) -> Result<Self, Box<dyn std::error::Error>> {
|
pub fn parse(logging_initialized: bool) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
Lua::new().context(|context| -> Result<Self, Box<dyn std::error::Error>> {
|
let lua = Lua::new();
|
||||||
let globals = context.globals();
|
let globals = lua.globals();
|
||||||
|
|
||||||
context
|
lua.load(&fs::read_to_string(file_path(FileType::Config)?)?)
|
||||||
.load(&fs::read_to_string(file_path(FileType::Config)?)?)
|
.exec()?;
|
||||||
.exec()?;
|
|
||||||
|
|
||||||
let parsed_threads: u8 = globals.get::<_, u8>("threads")?;
|
let parsed_threads: u8 = globals.get::<_, u8>("threads")?;
|
||||||
|
|
||||||
let debug: bool = globals.get::<_, bool>("debug")?;
|
let debug: bool = globals.get::<_, bool>("debug")?;
|
||||||
let logging:bool= globals.get::<_, bool>("logging")?;
|
let logging: bool = globals.get::<_, bool>("logging")?;
|
||||||
|
|
||||||
if !logging_initialized {
|
if !logging_initialized {
|
||||||
set_logging_level(debug, logging);
|
set_logging_level(debug, logging);
|
||||||
|
}
|
||||||
|
|
||||||
|
let threads: u8 = if parsed_threads == 0 {
|
||||||
|
let total_num_of_threads: usize = available_parallelism()?.get() / 2;
|
||||||
|
log::error!(
|
||||||
|
"Config Error: The value of `threads` option should be a non zero positive integer"
|
||||||
|
);
|
||||||
|
log::error!("Falling back to using {} threads", total_num_of_threads);
|
||||||
|
total_num_of_threads as u8
|
||||||
|
} else {
|
||||||
|
parsed_threads
|
||||||
|
};
|
||||||
|
|
||||||
|
let rate_limiter = globals.get::<_, HashMap<String, u8>>("rate_limiter")?;
|
||||||
|
|
||||||
|
let parsed_safe_search: u8 = globals.get::<_, u8>("safe_search")?;
|
||||||
|
let safe_search: u8 = match parsed_safe_search {
|
||||||
|
0..=4 => parsed_safe_search,
|
||||||
|
_ => {
|
||||||
|
log::error!("Config Error: The value of `safe_search` option should be a non zero positive integer from 0 to 4.");
|
||||||
|
log::error!("Falling back to using the value `1` for the option");
|
||||||
|
1
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let threads: u8 = if parsed_threads == 0 {
|
Ok(Config {
|
||||||
let total_num_of_threads: usize = available_parallelism()?.get() / 2;
|
port: globals.get::<_, u16>("port")?,
|
||||||
log::error!("Config Error: The value of `threads` option should be a non zero positive integer");
|
binding_ip: globals.get::<_, String>("binding_ip")?,
|
||||||
log::error!("Falling back to using {} threads", total_num_of_threads);
|
style: Style::new(
|
||||||
total_num_of_threads as u8
|
globals.get::<_, String>("theme")?,
|
||||||
} else {
|
globals.get::<_, String>("colorscheme")?,
|
||||||
parsed_threads
|
),
|
||||||
};
|
redis_url: globals.get::<_, String>("redis_url")?,
|
||||||
|
aggregator: AggregatorConfig {
|
||||||
Ok(Config {
|
random_delay: globals.get::<_, bool>("production_use")?,
|
||||||
port: globals.get::<_, u16>("port")?,
|
},
|
||||||
binding_ip: globals.get::<_, String>("binding_ip")?,
|
logging,
|
||||||
style: Style::new(
|
debug,
|
||||||
globals.get::<_, String>("theme")?,
|
upstream_search_engines: globals
|
||||||
globals.get::<_, String>("colorscheme")?,
|
.get::<_, HashMap<String, bool>>("upstream_search_engines")?
|
||||||
),
|
.into_iter()
|
||||||
redis_url: globals.get::<_, String>("redis_url")?,
|
.filter_map(|(key, value)| value.then_some(key))
|
||||||
aggregator: AggregatorConfig {
|
.filter_map(|engine| crate::models::engine_models::EngineHandler::new(&engine))
|
||||||
random_delay: globals.get::<_, bool>("production_use")?,
|
.collect(),
|
||||||
},
|
request_timeout: globals.get::<_, u8>("request_timeout")?,
|
||||||
logging,
|
threads,
|
||||||
debug,
|
rate_limiter: RateLimiter {
|
||||||
upstream_search_engines: globals
|
number_of_requests: rate_limiter["number_of_requests"],
|
||||||
.get::<_, HashMap<String, bool>>("upstream_search_engines")?
|
time_limit: rate_limiter["time_limit"],
|
||||||
.into_iter()
|
},
|
||||||
.filter_map(|(key, value)| value.then_some(key))
|
safe_search,
|
||||||
.filter_map(|engine| crate::models::engine_models::EngineHandler::new(&engine))
|
|
||||||
.collect(),
|
|
||||||
request_timeout: globals.get::<_, u8>("request_timeout")?,
|
|
||||||
threads,
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,14 +4,14 @@
|
|||||||
|
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use reqwest::header::{HeaderMap, CONTENT_TYPE, COOKIE, REFERER, USER_AGENT};
|
use reqwest::header::HeaderMap;
|
||||||
use scraper::{Html, Selector};
|
use scraper::{Html, Selector};
|
||||||
|
|
||||||
use crate::models::aggregation_models::SearchResult;
|
use crate::models::aggregation_models::SearchResult;
|
||||||
|
|
||||||
use crate::models::engine_models::{EngineError, SearchEngine};
|
use crate::models::engine_models::{EngineError, SearchEngine};
|
||||||
|
|
||||||
use error_stack::{IntoReport, Report, Result, ResultExt};
|
use error_stack::{Report, Result, ResultExt};
|
||||||
|
|
||||||
/// A new DuckDuckGo engine type defined in-order to implement the `SearchEngine` trait which allows to
|
/// A new DuckDuckGo engine type defined in-order to implement the `SearchEngine` trait which allows to
|
||||||
/// reduce code duplication as well as allows to create vector of different search engines easily.
|
/// reduce code duplication as well as allows to create vector of different search engines easily.
|
||||||
@ -21,10 +21,11 @@ pub struct DuckDuckGo;
|
|||||||
impl SearchEngine for DuckDuckGo {
|
impl SearchEngine for DuckDuckGo {
|
||||||
async fn results(
|
async fn results(
|
||||||
&self,
|
&self,
|
||||||
query: String,
|
query: &str,
|
||||||
page: u32,
|
page: u32,
|
||||||
user_agent: String,
|
user_agent: &str,
|
||||||
request_timeout: u8,
|
request_timeout: u8,
|
||||||
|
_safe_search: u8,
|
||||||
) -> Result<HashMap<String, SearchResult>, EngineError> {
|
) -> Result<HashMap<String, SearchResult>, EngineError> {
|
||||||
// Page number can be missing or empty string and so appropriate handling is required
|
// Page number can be missing or empty string and so appropriate handling is required
|
||||||
// so that upstream server recieves valid page number.
|
// so that upstream server recieves valid page number.
|
||||||
@ -43,38 +44,19 @@ impl SearchEngine for DuckDuckGo {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// initializing HeaderMap and adding appropriate headers.
|
// initializing HeaderMap and adding appropriate headers.
|
||||||
let mut header_map = HeaderMap::new();
|
let header_map = HeaderMap::try_from(&HashMap::from([
|
||||||
header_map.insert(
|
("USER_AGENT".to_string(), user_agent.to_string()),
|
||||||
USER_AGENT,
|
("REFERER".to_string(), "https://google.com/".to_string()),
|
||||||
user_agent
|
(
|
||||||
.parse()
|
"CONTENT_TYPE".to_string(),
|
||||||
.into_report()
|
"application/x-www-form-urlencoded".to_string(),
|
||||||
.change_context(EngineError::UnexpectedError)?,
|
),
|
||||||
);
|
("COOKIE".to_string(), "kl=wt-wt".to_string()),
|
||||||
header_map.insert(
|
]))
|
||||||
REFERER,
|
.change_context(EngineError::UnexpectedError)?;
|
||||||
"https://google.com/"
|
|
||||||
.parse()
|
|
||||||
.into_report()
|
|
||||||
.change_context(EngineError::UnexpectedError)?,
|
|
||||||
);
|
|
||||||
header_map.insert(
|
|
||||||
CONTENT_TYPE,
|
|
||||||
"application/x-www-form-urlencoded"
|
|
||||||
.parse()
|
|
||||||
.into_report()
|
|
||||||
.change_context(EngineError::UnexpectedError)?,
|
|
||||||
);
|
|
||||||
header_map.insert(
|
|
||||||
COOKIE,
|
|
||||||
"kl=wt-wt"
|
|
||||||
.parse()
|
|
||||||
.into_report()
|
|
||||||
.change_context(EngineError::UnexpectedError)?,
|
|
||||||
);
|
|
||||||
|
|
||||||
let document: Html = Html::parse_document(
|
let document: Html = Html::parse_document(
|
||||||
&DuckDuckGo::fetch_html_from_upstream(self, url, header_map, request_timeout).await?,
|
&DuckDuckGo::fetch_html_from_upstream(self, &url, header_map, request_timeout).await?,
|
||||||
);
|
);
|
||||||
|
|
||||||
let no_result: Selector = Selector::parse(".no-results")
|
let no_result: Selector = Selector::parse(".no-results")
|
||||||
@ -108,8 +90,7 @@ impl SearchEngine for DuckDuckGo {
|
|||||||
.next()
|
.next()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.inner_html()
|
.inner_html()
|
||||||
.trim()
|
.trim(),
|
||||||
.to_string(),
|
|
||||||
format!(
|
format!(
|
||||||
"https://{}",
|
"https://{}",
|
||||||
result
|
result
|
||||||
@ -118,15 +99,15 @@ impl SearchEngine for DuckDuckGo {
|
|||||||
.unwrap()
|
.unwrap()
|
||||||
.inner_html()
|
.inner_html()
|
||||||
.trim()
|
.trim()
|
||||||
),
|
)
|
||||||
|
.as_str(),
|
||||||
result
|
result
|
||||||
.select(&result_desc)
|
.select(&result_desc)
|
||||||
.next()
|
.next()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.inner_html()
|
.inner_html()
|
||||||
.trim()
|
.trim(),
|
||||||
.to_string(),
|
&["duckduckgo"],
|
||||||
vec!["duckduckgo".to_string()],
|
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.map(|search_result| (search_result.url.clone(), search_result))
|
.map(|search_result| (search_result.url.clone(), search_result))
|
||||||
|
@ -2,14 +2,13 @@
|
|||||||
//! by querying the upstream searx search engine instance with user provided query and with a page
|
//! by querying the upstream searx search engine instance with user provided query and with a page
|
||||||
//! number if provided.
|
//! number if provided.
|
||||||
|
|
||||||
use reqwest::header::{HeaderMap, CONTENT_TYPE, COOKIE, REFERER, USER_AGENT};
|
use reqwest::header::HeaderMap;
|
||||||
use scraper::{Html, Selector};
|
use scraper::{Html, Selector};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use crate::models::aggregation_models::SearchResult;
|
use crate::models::aggregation_models::SearchResult;
|
||||||
|
|
||||||
use crate::models::engine_models::{EngineError, SearchEngine};
|
use crate::models::engine_models::{EngineError, SearchEngine};
|
||||||
use error_stack::{IntoReport, Report, Result, ResultExt};
|
use error_stack::{Report, Result, ResultExt};
|
||||||
|
|
||||||
/// A new Searx engine type defined in-order to implement the `SearchEngine` trait which allows to
|
/// A new Searx engine type defined in-order to implement the `SearchEngine` trait which allows to
|
||||||
/// reduce code duplication as well as allows to create vector of different search engines easily.
|
/// reduce code duplication as well as allows to create vector of different search engines easily.
|
||||||
@ -19,45 +18,38 @@ pub struct Searx;
|
|||||||
impl SearchEngine for Searx {
|
impl SearchEngine for Searx {
|
||||||
async fn results(
|
async fn results(
|
||||||
&self,
|
&self,
|
||||||
query: String,
|
query: &str,
|
||||||
page: u32,
|
page: u32,
|
||||||
user_agent: String,
|
user_agent: &str,
|
||||||
request_timeout: u8,
|
request_timeout: u8,
|
||||||
|
mut safe_search: u8,
|
||||||
) -> Result<HashMap<String, SearchResult>, EngineError> {
|
) -> Result<HashMap<String, SearchResult>, EngineError> {
|
||||||
// Page number can be missing or empty string and so appropriate handling is required
|
// Page number can be missing or empty string and so appropriate handling is required
|
||||||
// so that upstream server recieves valid page number.
|
// so that upstream server recieves valid page number.
|
||||||
|
if safe_search == 3 {
|
||||||
|
safe_search = 2;
|
||||||
|
};
|
||||||
|
|
||||||
let url: String = match page {
|
let url: String = match page {
|
||||||
0 | 1 => format!("https://searx.work/search?q={query}&pageno=1"),
|
0 | 1 => {
|
||||||
_ => format!("https://searx.work/search?q={query}&pageno={page}"),
|
format!("https://searx.work/search?q={query}&pageno=1&safesearch={safe_search}")
|
||||||
|
}
|
||||||
|
_ => format!(
|
||||||
|
"https://searx.work/search?q={query}&pageno={page}&safesearch={safe_search}"
|
||||||
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
// initializing headers and adding appropriate headers.
|
// initializing headers and adding appropriate headers.
|
||||||
let mut header_map = HeaderMap::new();
|
let header_map = HeaderMap::try_from(&HashMap::from([
|
||||||
header_map.insert(
|
("USER_AGENT".to_string(), user_agent.to_string()),
|
||||||
USER_AGENT,
|
("REFERER".to_string(), "https://google.com/".to_string()),
|
||||||
user_agent
|
("CONTENT_TYPE".to_string(), "application/x-www-form-urlencoded".to_string()),
|
||||||
.parse()
|
("COOKIE".to_string(), "categories=general; language=auto; locale=en; autocomplete=duckduckgo; image_proxy=1; method=POST; safesearch=2; theme=simple; results_on_new_tab=1; doi_resolver=oadoi.org; simple_style=auto; center_alignment=1; query_in_title=1; infinite_scroll=0; disabled_engines=; enabled_engines=\"archive is__general\\054yep__general\\054curlie__general\\054currency__general\\054ddg definitions__general\\054wikidata__general\\054duckduckgo__general\\054tineye__general\\054lingva__general\\054startpage__general\\054yahoo__general\\054wiby__general\\054marginalia__general\\054alexandria__general\\054wikibooks__general\\054wikiquote__general\\054wikisource__general\\054wikiversity__general\\054wikivoyage__general\\054dictzone__general\\054seznam__general\\054mojeek__general\\054naver__general\\054wikimini__general\\054brave__general\\054petalsearch__general\\054goo__general\"; disabled_plugins=; enabled_plugins=\"searx.plugins.hostname_replace\\054searx.plugins.oa_doi_rewrite\\054searx.plugins.vim_hotkeys\"; tokens=; maintab=on; enginetab=on".to_string())
|
||||||
.into_report()
|
]))
|
||||||
.change_context(EngineError::UnexpectedError)?,
|
.change_context(EngineError::UnexpectedError)?;
|
||||||
);
|
|
||||||
header_map.insert(
|
|
||||||
REFERER,
|
|
||||||
"https://google.com/"
|
|
||||||
.parse()
|
|
||||||
.into_report()
|
|
||||||
.change_context(EngineError::UnexpectedError)?,
|
|
||||||
);
|
|
||||||
header_map.insert(
|
|
||||||
CONTENT_TYPE,
|
|
||||||
"application/x-www-form-urlencoded"
|
|
||||||
.parse()
|
|
||||||
.into_report()
|
|
||||||
.change_context(EngineError::UnexpectedError)?,
|
|
||||||
);
|
|
||||||
header_map.insert(COOKIE, "categories=general; language=auto; locale=en; autocomplete=duckduckgo; image_proxy=1; method=POST; safesearch=2; theme=simple; results_on_new_tab=1; doi_resolver=oadoi.org; simple_style=auto; center_alignment=1; query_in_title=1; infinite_scroll=0; disabled_engines=; enabled_engines=\"archive is__general\\054yep__general\\054curlie__general\\054currency__general\\054ddg definitions__general\\054wikidata__general\\054duckduckgo__general\\054tineye__general\\054lingva__general\\054startpage__general\\054yahoo__general\\054wiby__general\\054marginalia__general\\054alexandria__general\\054wikibooks__general\\054wikiquote__general\\054wikisource__general\\054wikiversity__general\\054wikivoyage__general\\054dictzone__general\\054seznam__general\\054mojeek__general\\054naver__general\\054wikimini__general\\054brave__general\\054petalsearch__general\\054goo__general\"; disabled_plugins=; enabled_plugins=\"searx.plugins.hostname_replace\\054searx.plugins.oa_doi_rewrite\\054searx.plugins.vim_hotkeys\"; tokens=; maintab=on; enginetab=on".parse().into_report().change_context(EngineError::UnexpectedError)?);
|
|
||||||
|
|
||||||
let document: Html = Html::parse_document(
|
let document: Html = Html::parse_document(
|
||||||
&Searx::fetch_html_from_upstream(self, url, header_map, request_timeout).await?,
|
&Searx::fetch_html_from_upstream(self, &url, header_map, request_timeout).await?,
|
||||||
);
|
);
|
||||||
|
|
||||||
let no_result: Selector = Selector::parse("#urls>.dialog-error>p")
|
let no_result: Selector = Selector::parse("#urls>.dialog-error>p")
|
||||||
@ -98,24 +90,21 @@ impl SearchEngine for Searx {
|
|||||||
.next()
|
.next()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.inner_html()
|
.inner_html()
|
||||||
.trim()
|
.trim(),
|
||||||
.to_string(),
|
|
||||||
result
|
result
|
||||||
.select(&result_url)
|
.select(&result_url)
|
||||||
.next()
|
.next()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.value()
|
.value()
|
||||||
.attr("href")
|
.attr("href")
|
||||||
.unwrap()
|
.unwrap(),
|
||||||
.to_string(),
|
|
||||||
result
|
result
|
||||||
.select(&result_desc)
|
.select(&result_desc)
|
||||||
.next()
|
.next()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.inner_html()
|
.inner_html()
|
||||||
.trim()
|
.trim(),
|
||||||
.to_string(),
|
&["searx"],
|
||||||
vec!["searx".to_string()],
|
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.map(|search_result| (search_result.url.clone(), search_result))
|
.map(|search_result| (search_result.url.clone(), search_result))
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::io::Error;
|
use std::io::Error;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
use std::sync::OnceLock;
|
||||||
|
|
||||||
// ------- Constants --------
|
// ------- Constants --------
|
||||||
/// The constant holding the name of the theme folder.
|
/// The constant holding the name of the theme folder.
|
||||||
@ -31,57 +32,7 @@ pub enum FileType {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// A static variable which stores the different filesystem paths for various file/folder types.
|
/// A static variable which stores the different filesystem paths for various file/folder types.
|
||||||
static FILE_PATHS_FOR_DIFF_FILE_TYPES: once_cell::sync::Lazy<HashMap<FileType, Vec<String>>> =
|
static FILE_PATHS_FOR_DIFF_FILE_TYPES: OnceLock<HashMap<FileType, Vec<String>>> = OnceLock::new();
|
||||||
once_cell::sync::Lazy::new(|| {
|
|
||||||
HashMap::from([
|
|
||||||
(
|
|
||||||
FileType::Config,
|
|
||||||
vec![
|
|
||||||
format!(
|
|
||||||
"{}/.config/{}/{}",
|
|
||||||
std::env::var("HOME").unwrap(),
|
|
||||||
COMMON_DIRECTORY_NAME,
|
|
||||||
CONFIG_FILE_NAME
|
|
||||||
),
|
|
||||||
format!("/etc/xdg/{}/{}", COMMON_DIRECTORY_NAME, CONFIG_FILE_NAME),
|
|
||||||
format!("./{}/{}", COMMON_DIRECTORY_NAME, CONFIG_FILE_NAME),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
(
|
|
||||||
FileType::Theme,
|
|
||||||
vec![
|
|
||||||
format!("/opt/websurfx/{}/", PUBLIC_DIRECTORY_NAME),
|
|
||||||
format!("./{}/", PUBLIC_DIRECTORY_NAME),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
(
|
|
||||||
FileType::AllowList,
|
|
||||||
vec![
|
|
||||||
format!(
|
|
||||||
"{}/.config/{}/{}",
|
|
||||||
std::env::var("HOME").unwrap(),
|
|
||||||
COMMON_DIRECTORY_NAME,
|
|
||||||
ALLOWLIST_FILE_NAME
|
|
||||||
),
|
|
||||||
format!("/etc/xdg/{}/{}", COMMON_DIRECTORY_NAME, ALLOWLIST_FILE_NAME),
|
|
||||||
format!("./{}/{}", COMMON_DIRECTORY_NAME, ALLOWLIST_FILE_NAME),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
(
|
|
||||||
FileType::BlockList,
|
|
||||||
vec![
|
|
||||||
format!(
|
|
||||||
"{}/.config/{}/{}",
|
|
||||||
std::env::var("HOME").unwrap(),
|
|
||||||
COMMON_DIRECTORY_NAME,
|
|
||||||
BLOCKLIST_FILE_NAME
|
|
||||||
),
|
|
||||||
format!("/etc/xdg/{}/{}", COMMON_DIRECTORY_NAME, BLOCKLIST_FILE_NAME),
|
|
||||||
format!("./{}/{}", COMMON_DIRECTORY_NAME, BLOCKLIST_FILE_NAME),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
])
|
|
||||||
});
|
|
||||||
|
|
||||||
/// A function which returns an appropriate path for thr provided file type by checking if the path
|
/// A function which returns an appropriate path for thr provided file type by checking if the path
|
||||||
/// for the given file type exists on that path.
|
/// for the given file type exists on that path.
|
||||||
@ -99,11 +50,64 @@ static FILE_PATHS_FOR_DIFF_FILE_TYPES: once_cell::sync::Lazy<HashMap<FileType, V
|
|||||||
/// 1. `/opt/websurfx` if it not present here then it fallbacks to the next one (2)
|
/// 1. `/opt/websurfx` if it not present here then it fallbacks to the next one (2)
|
||||||
/// 2. Under project folder ( or codebase in other words) if it is not present
|
/// 2. Under project folder ( or codebase in other words) if it is not present
|
||||||
/// here then it returns an error as mentioned above.
|
/// here then it returns an error as mentioned above.
|
||||||
pub fn file_path(file_type: FileType) -> Result<String, Error> {
|
pub fn file_path(file_type: FileType) -> Result<&'static str, Error> {
|
||||||
let file_path = FILE_PATHS_FOR_DIFF_FILE_TYPES.get(&file_type).unwrap();
|
let file_path: &Vec<String> = FILE_PATHS_FOR_DIFF_FILE_TYPES
|
||||||
|
.get_or_init(|| {
|
||||||
|
HashMap::from([
|
||||||
|
(
|
||||||
|
FileType::Config,
|
||||||
|
vec![
|
||||||
|
format!(
|
||||||
|
"{}/.config/{}/{}",
|
||||||
|
std::env::var("HOME").unwrap(),
|
||||||
|
COMMON_DIRECTORY_NAME,
|
||||||
|
CONFIG_FILE_NAME
|
||||||
|
),
|
||||||
|
format!("/etc/xdg/{}/{}", COMMON_DIRECTORY_NAME, CONFIG_FILE_NAME),
|
||||||
|
format!("./{}/{}", COMMON_DIRECTORY_NAME, CONFIG_FILE_NAME),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
(
|
||||||
|
FileType::Theme,
|
||||||
|
vec![
|
||||||
|
format!("/opt/websurfx/{}/", PUBLIC_DIRECTORY_NAME),
|
||||||
|
format!("./{}/", PUBLIC_DIRECTORY_NAME),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
(
|
||||||
|
FileType::AllowList,
|
||||||
|
vec![
|
||||||
|
format!(
|
||||||
|
"{}/.config/{}/{}",
|
||||||
|
std::env::var("HOME").unwrap(),
|
||||||
|
COMMON_DIRECTORY_NAME,
|
||||||
|
ALLOWLIST_FILE_NAME
|
||||||
|
),
|
||||||
|
format!("/etc/xdg/{}/{}", COMMON_DIRECTORY_NAME, ALLOWLIST_FILE_NAME),
|
||||||
|
format!("./{}/{}", COMMON_DIRECTORY_NAME, ALLOWLIST_FILE_NAME),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
(
|
||||||
|
FileType::BlockList,
|
||||||
|
vec![
|
||||||
|
format!(
|
||||||
|
"{}/.config/{}/{}",
|
||||||
|
std::env::var("HOME").unwrap(),
|
||||||
|
COMMON_DIRECTORY_NAME,
|
||||||
|
BLOCKLIST_FILE_NAME
|
||||||
|
),
|
||||||
|
format!("/etc/xdg/{}/{}", COMMON_DIRECTORY_NAME, BLOCKLIST_FILE_NAME),
|
||||||
|
format!("./{}/{}", COMMON_DIRECTORY_NAME, BLOCKLIST_FILE_NAME),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
])
|
||||||
|
})
|
||||||
|
.get(&file_type)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
for (idx, _) in file_path.iter().enumerate() {
|
for (idx, _) in file_path.iter().enumerate() {
|
||||||
if Path::new(file_path[idx].as_str()).exists() {
|
if Path::new(file_path[idx].as_str()).exists() {
|
||||||
return Ok(file_path[idx].clone());
|
return Ok(std::mem::take(&mut &*file_path[idx]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
12
src/lib.rs
12
src/lib.rs
@ -19,6 +19,7 @@ use crate::server::router;
|
|||||||
|
|
||||||
use actix_cors::Cors;
|
use actix_cors::Cors;
|
||||||
use actix_files as fs;
|
use actix_files as fs;
|
||||||
|
use actix_governor::{Governor, GovernorConfigBuilder};
|
||||||
use actix_web::{dev::Server, http::header, middleware::Logger, web, App, HttpServer};
|
use actix_web::{dev::Server, http::header, middleware::Logger, web, App, HttpServer};
|
||||||
use config::parser::Config;
|
use config::parser::Config;
|
||||||
use handlebars::Handlebars;
|
use handlebars::Handlebars;
|
||||||
@ -47,7 +48,7 @@ use handler::paths::{file_path, FileType};
|
|||||||
pub fn run(listener: TcpListener, config: Config) -> std::io::Result<Server> {
|
pub fn run(listener: TcpListener, config: Config) -> std::io::Result<Server> {
|
||||||
let mut handlebars: Handlebars<'_> = Handlebars::new();
|
let mut handlebars: Handlebars<'_> = Handlebars::new();
|
||||||
|
|
||||||
let public_folder_path: String = file_path(FileType::Theme)?;
|
let public_folder_path: &str = file_path(FileType::Theme)?;
|
||||||
|
|
||||||
handlebars
|
handlebars
|
||||||
.register_templates_directory(".html", format!("{}/templates", public_folder_path))
|
.register_templates_directory(".html", format!("{}/templates", public_folder_path))
|
||||||
@ -69,10 +70,17 @@ pub fn run(listener: TcpListener, config: Config) -> std::io::Result<Server> {
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
App::new()
|
App::new()
|
||||||
|
.wrap(Logger::default()) // added logging middleware for logging.
|
||||||
.app_data(handlebars_ref.clone())
|
.app_data(handlebars_ref.clone())
|
||||||
.app_data(web::Data::new(config.clone()))
|
.app_data(web::Data::new(config.clone()))
|
||||||
.wrap(cors)
|
.wrap(cors)
|
||||||
.wrap(Logger::default()) // added logging middleware for logging.
|
.wrap(Governor::new(
|
||||||
|
&GovernorConfigBuilder::default()
|
||||||
|
.per_second(config.rate_limiter.time_limit as u64)
|
||||||
|
.burst_size(config.rate_limiter.number_of_requests as u32)
|
||||||
|
.finish()
|
||||||
|
.unwrap(),
|
||||||
|
))
|
||||||
// Serve images and static files (css and js files).
|
// Serve images and static files (css and js files).
|
||||||
.service(
|
.service(
|
||||||
fs::Files::new("/static", format!("{}/static", public_folder_path))
|
fs::Files::new("/static", format!("{}/static", public_folder_path))
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
//! data scraped from the upstream search engines.
|
//! data scraped from the upstream search engines.
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use smallvec::SmallVec;
|
||||||
|
|
||||||
use super::{engine_models::EngineError, parser_models::Style};
|
use super::{engine_models::EngineError, parser_models::Style};
|
||||||
|
|
||||||
@ -19,7 +20,7 @@ pub struct SearchResult {
|
|||||||
/// The description of the search result.
|
/// The description of the search result.
|
||||||
pub description: String,
|
pub description: String,
|
||||||
/// The names of the upstream engines from which this results were provided.
|
/// The names of the upstream engines from which this results were provided.
|
||||||
pub engine: Vec<String>,
|
pub engine: SmallVec<[String; 0]>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SearchResult {
|
impl SearchResult {
|
||||||
@ -32,12 +33,12 @@ impl SearchResult {
|
|||||||
/// (href url in html in simple words).
|
/// (href url in html in simple words).
|
||||||
/// * `description` - The description of the search result.
|
/// * `description` - The description of the search result.
|
||||||
/// * `engine` - The names of the upstream engines from which this results were provided.
|
/// * `engine` - The names of the upstream engines from which this results were provided.
|
||||||
pub fn new(title: String, url: String, description: String, engine: Vec<String>) -> Self {
|
pub fn new(title: &str, url: &str, description: &str, engine: &[&str]) -> Self {
|
||||||
SearchResult {
|
SearchResult {
|
||||||
title,
|
title: title.to_owned(),
|
||||||
url,
|
url: url.to_owned(),
|
||||||
description,
|
description: description.to_owned(),
|
||||||
engine,
|
engine: engine.iter().map(|name| name.to_string()).collect(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,8 +47,8 @@ impl SearchResult {
|
|||||||
/// # Arguments
|
/// # Arguments
|
||||||
///
|
///
|
||||||
/// * `engine` - Takes an engine name provided as a String.
|
/// * `engine` - Takes an engine name provided as a String.
|
||||||
pub fn add_engines(&mut self, engine: String) {
|
pub fn add_engines(&mut self, engine: &str) {
|
||||||
self.engine.push(engine)
|
self.engine.push(engine.to_owned())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A function which returns the engine name stored from the struct as a string.
|
/// A function which returns the engine name stored from the struct as a string.
|
||||||
@ -55,13 +56,13 @@ impl SearchResult {
|
|||||||
/// # Returns
|
/// # Returns
|
||||||
///
|
///
|
||||||
/// An engine name stored as a string from the struct.
|
/// An engine name stored as a string from the struct.
|
||||||
pub fn engine(self) -> String {
|
pub fn engine(&mut self) -> String {
|
||||||
self.engine.get(0).unwrap().to_string()
|
std::mem::take(&mut self.engine[0])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A named struct that stores the error info related to the upstream search engines.
|
/// A named struct that stores the error info related to the upstream search engines.
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize, Clone)]
|
||||||
pub struct EngineErrorInfo {
|
pub struct EngineErrorInfo {
|
||||||
/// It stores the error type which occured while fetching the result from a particular search
|
/// It stores the error type which occured while fetching the result from a particular search
|
||||||
/// engine.
|
/// engine.
|
||||||
@ -81,18 +82,18 @@ impl EngineErrorInfo {
|
|||||||
/// * `error` - It takes the error type which occured while fetching the result from a particular
|
/// * `error` - It takes the error type which occured while fetching the result from a particular
|
||||||
/// search engine.
|
/// search engine.
|
||||||
/// * `engine` - It takes the name of the engine that failed to provide the requested search results.
|
/// * `engine` - It takes the name of the engine that failed to provide the requested search results.
|
||||||
pub fn new(error: &EngineError, engine: String) -> Self {
|
pub fn new(error: &EngineError, engine: &str) -> Self {
|
||||||
Self {
|
Self {
|
||||||
error: match error {
|
error: match error {
|
||||||
EngineError::RequestError => String::from("RequestError"),
|
EngineError::RequestError => "RequestError".to_owned(),
|
||||||
EngineError::EmptyResultSet => String::from("EmptyResultSet"),
|
EngineError::EmptyResultSet => "EmptyResultSet".to_owned(),
|
||||||
EngineError::UnexpectedError => String::from("UnexpectedError"),
|
EngineError::UnexpectedError => "UnexpectedError".to_owned(),
|
||||||
},
|
},
|
||||||
engine,
|
engine: engine.to_owned(),
|
||||||
severity_color: match error {
|
severity_color: match error {
|
||||||
EngineError::RequestError => String::from("green"),
|
EngineError::RequestError => "green".to_owned(),
|
||||||
EngineError::EmptyResultSet => String::from("blue"),
|
EngineError::EmptyResultSet => "blue".to_owned(),
|
||||||
EngineError::UnexpectedError => String::from("red"),
|
EngineError::UnexpectedError => "red".to_owned(),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -101,7 +102,7 @@ impl EngineErrorInfo {
|
|||||||
/// A named struct to store, serialize, deserialize the all the search results scraped and
|
/// A named struct to store, serialize, deserialize the all the search results scraped and
|
||||||
/// aggregated from the upstream search engines.
|
/// aggregated from the upstream search engines.
|
||||||
/// `SearchResult` structs.
|
/// `SearchResult` structs.
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize, Default)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct SearchResults {
|
pub struct SearchResults {
|
||||||
/// Stores the individual serializable `SearchResult` struct into a vector of
|
/// Stores the individual serializable `SearchResult` struct into a vector of
|
||||||
@ -113,6 +114,14 @@ pub struct SearchResults {
|
|||||||
/// Stores the information on which engines failed with their engine name
|
/// Stores the information on which engines failed with their engine name
|
||||||
/// and the type of error that caused it.
|
/// and the type of error that caused it.
|
||||||
pub engine_errors_info: Vec<EngineErrorInfo>,
|
pub engine_errors_info: Vec<EngineErrorInfo>,
|
||||||
|
/// Stores the flag option which holds the check value that the following
|
||||||
|
/// search query was disallowed when the safe search level set to 4 and it
|
||||||
|
/// was present in the `Blocklist` file.
|
||||||
|
pub disallowed: bool,
|
||||||
|
/// Stores the flag option which holds the check value that the following
|
||||||
|
/// search query was filtered when the safe search level set to 3 and it
|
||||||
|
/// was present in the `Blocklist` file.
|
||||||
|
pub filtered: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SearchResults {
|
impl SearchResults {
|
||||||
@ -124,23 +133,49 @@ impl SearchResults {
|
|||||||
/// and stores it into a vector of `SearchResult` structs.
|
/// and stores it into a vector of `SearchResult` structs.
|
||||||
/// * `page_query` - Takes an argument of current page`s search query `q` provided in
|
/// * `page_query` - Takes an argument of current page`s search query `q` provided in
|
||||||
/// the search url.
|
/// the search url.
|
||||||
/// * `empty_result_set` - Takes a boolean which indicates that no engines gave a result for the
|
/// * `engine_errors_info` - Takes an array of structs which contains information regarding
|
||||||
/// given search query.
|
/// which engines failed with their names, reason and their severity color name.
|
||||||
pub fn new(
|
pub fn new(
|
||||||
results: Vec<SearchResult>,
|
results: Vec<SearchResult>,
|
||||||
page_query: String,
|
page_query: &str,
|
||||||
engine_errors_info: Vec<EngineErrorInfo>,
|
engine_errors_info: &[EngineErrorInfo],
|
||||||
) -> Self {
|
) -> Self {
|
||||||
SearchResults {
|
Self {
|
||||||
results,
|
results,
|
||||||
page_query,
|
page_query: page_query.to_owned(),
|
||||||
style: Style::new("".to_string(), "".to_string()),
|
style: Style::default(),
|
||||||
engine_errors_info,
|
engine_errors_info: engine_errors_info.to_owned(),
|
||||||
|
disallowed: Default::default(),
|
||||||
|
filtered: Default::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A setter function to add website style to the return search results.
|
/// A setter function to add website style to the return search results.
|
||||||
pub fn add_style(&mut self, style: Style) {
|
pub fn add_style(&mut self, style: &Style) {
|
||||||
self.style = style;
|
self.style = style.clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A setter function that sets disallowed to true.
|
||||||
|
pub fn set_disallowed(&mut self) {
|
||||||
|
self.disallowed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A setter function to set the current page search query.
|
||||||
|
pub fn set_page_query(&mut self, page: &str) {
|
||||||
|
self.page_query = page.to_owned();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A setter function that sets the filtered to true.
|
||||||
|
pub fn set_filtered(&mut self) {
|
||||||
|
self.filtered = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A getter function that gets the value of `engine_errors_info`.
|
||||||
|
pub fn engine_errors_info(&mut self) -> Vec<EngineErrorInfo> {
|
||||||
|
std::mem::take(&mut self.engine_errors_info)
|
||||||
|
}
|
||||||
|
/// A getter function that gets the value of `results`.
|
||||||
|
pub fn results(&mut self) -> Vec<SearchResult> {
|
||||||
|
self.results.clone()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
//! the upstream search engines with the search query provided by the user.
|
//! the upstream search engines with the search query provided by the user.
|
||||||
|
|
||||||
use super::aggregation_models::SearchResult;
|
use super::aggregation_models::SearchResult;
|
||||||
use error_stack::{IntoReport, Result, ResultExt};
|
use error_stack::{Result, ResultExt};
|
||||||
use std::{collections::HashMap, fmt, time::Duration};
|
use std::{collections::HashMap, fmt, time::Duration};
|
||||||
|
|
||||||
/// A custom error type used for handle engine associated errors.
|
/// A custom error type used for handle engine associated errors.
|
||||||
@ -64,7 +64,7 @@ pub trait SearchEngine: Sync + Send {
|
|||||||
/// otherwise it returns a custom `EngineError`.
|
/// otherwise it returns a custom `EngineError`.
|
||||||
async fn fetch_html_from_upstream(
|
async fn fetch_html_from_upstream(
|
||||||
&self,
|
&self,
|
||||||
url: String,
|
url: &str,
|
||||||
header_map: reqwest::header::HeaderMap,
|
header_map: reqwest::header::HeaderMap,
|
||||||
request_timeout: u8,
|
request_timeout: u8,
|
||||||
) -> Result<String, EngineError> {
|
) -> Result<String, EngineError> {
|
||||||
@ -75,11 +75,9 @@ pub trait SearchEngine: Sync + Send {
|
|||||||
.headers(header_map) // add spoofed headers to emulate human behavior
|
.headers(header_map) // add spoofed headers to emulate human behavior
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
.into_report()
|
|
||||||
.change_context(EngineError::RequestError)?
|
.change_context(EngineError::RequestError)?
|
||||||
.text()
|
.text()
|
||||||
.await
|
.await
|
||||||
.into_report()
|
|
||||||
.change_context(EngineError::RequestError)?)
|
.change_context(EngineError::RequestError)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,10 +101,11 @@ pub trait SearchEngine: Sync + Send {
|
|||||||
/// or HeaderMap fails to initialize.
|
/// or HeaderMap fails to initialize.
|
||||||
async fn results(
|
async fn results(
|
||||||
&self,
|
&self,
|
||||||
query: String,
|
query: &str,
|
||||||
page: u32,
|
page: u32,
|
||||||
user_agent: String,
|
user_agent: &str,
|
||||||
request_timeout: u8,
|
request_timeout: u8,
|
||||||
|
safe_search: u8,
|
||||||
) -> Result<HashMap<String, SearchResult>, EngineError>;
|
) -> Result<HashMap<String, SearchResult>, EngineError>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
/// order to allow the deserializing the json back to struct in aggregate function in
|
/// order to allow the deserializing the json back to struct in aggregate function in
|
||||||
/// aggregator.rs and create a new struct out of it and then serialize it back to json and pass
|
/// aggregator.rs and create a new struct out of it and then serialize it back to json and pass
|
||||||
/// it to the template files.
|
/// it to the template files.
|
||||||
#[derive(Serialize, Deserialize, Clone)]
|
#[derive(Serialize, Deserialize, Clone, Default)]
|
||||||
pub struct Style {
|
pub struct Style {
|
||||||
/// It stores the parsed theme option used to set a theme for the website.
|
/// It stores the parsed theme option used to set a theme for the website.
|
||||||
pub theme: String,
|
pub theme: String,
|
||||||
@ -33,3 +33,20 @@ impl Style {
|
|||||||
Style { theme, colorscheme }
|
Style { theme, colorscheme }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Configuration options for the aggregator.
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct AggregatorConfig {
|
||||||
|
/// It stores the option to whether enable or disable random delays between
|
||||||
|
/// requests.
|
||||||
|
pub random_delay: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Configuration options for the rate limiter middleware.
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct RateLimiter {
|
||||||
|
/// The number of request that are allowed within a provided time limit.
|
||||||
|
pub number_of_requests: u8,
|
||||||
|
/// The time limit in which the quantity of requests that should be accepted.
|
||||||
|
pub time_limit: u8,
|
||||||
|
}
|
||||||
|
@ -60,14 +60,15 @@ type FutureVec = Vec<JoinHandle<Result<HashMap<String, SearchResult>, Report<Eng
|
|||||||
/// function in either `searx` or `duckduckgo` or both otherwise returns a `SearchResults struct`
|
/// function in either `searx` or `duckduckgo` or both otherwise returns a `SearchResults struct`
|
||||||
/// containing appropriate values.
|
/// containing appropriate values.
|
||||||
pub async fn aggregate(
|
pub async fn aggregate(
|
||||||
query: String,
|
query: &str,
|
||||||
page: u32,
|
page: u32,
|
||||||
random_delay: bool,
|
random_delay: bool,
|
||||||
debug: bool,
|
debug: bool,
|
||||||
upstream_search_engines: Vec<EngineHandler>,
|
upstream_search_engines: &[EngineHandler],
|
||||||
request_timeout: u8,
|
request_timeout: u8,
|
||||||
|
safe_search: u8,
|
||||||
) -> Result<SearchResults, Box<dyn std::error::Error>> {
|
) -> Result<SearchResults, Box<dyn std::error::Error>> {
|
||||||
let user_agent: String = random_user_agent();
|
let user_agent: &str = random_user_agent();
|
||||||
|
|
||||||
// Add a random delay before making the request.
|
// Add a random delay before making the request.
|
||||||
if random_delay || !debug {
|
if random_delay || !debug {
|
||||||
@ -76,19 +77,24 @@ pub async fn aggregate(
|
|||||||
tokio::time::sleep(Duration::from_secs(delay_secs)).await;
|
tokio::time::sleep(Duration::from_secs(delay_secs)).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut names: Vec<&str> = vec![];
|
let mut names: Vec<&str> = Vec::with_capacity(0);
|
||||||
|
|
||||||
// create tasks for upstream result fetching
|
// create tasks for upstream result fetching
|
||||||
let mut tasks: FutureVec = FutureVec::new();
|
let mut tasks: FutureVec = FutureVec::new();
|
||||||
|
|
||||||
for engine_handler in upstream_search_engines {
|
for engine_handler in upstream_search_engines {
|
||||||
let (name, search_engine) = engine_handler.into_name_engine();
|
let (name, search_engine) = engine_handler.to_owned().into_name_engine();
|
||||||
names.push(name);
|
names.push(name);
|
||||||
let query: String = query.clone();
|
let query: String = query.to_owned();
|
||||||
let user_agent: String = user_agent.clone();
|
|
||||||
tasks.push(tokio::spawn(async move {
|
tasks.push(tokio::spawn(async move {
|
||||||
search_engine
|
search_engine
|
||||||
.results(query, page, user_agent.clone(), request_timeout)
|
.results(
|
||||||
|
&query,
|
||||||
|
page,
|
||||||
|
user_agent.clone(),
|
||||||
|
request_timeout,
|
||||||
|
safe_search,
|
||||||
|
)
|
||||||
.await
|
.await
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
@ -106,7 +112,7 @@ pub async fn aggregate(
|
|||||||
let mut result_map: HashMap<String, SearchResult> = HashMap::new();
|
let mut result_map: HashMap<String, SearchResult> = HashMap::new();
|
||||||
let mut engine_errors_info: Vec<EngineErrorInfo> = Vec::new();
|
let mut engine_errors_info: Vec<EngineErrorInfo> = Vec::new();
|
||||||
|
|
||||||
let mut handle_error = |error: Report<EngineError>, engine_name: String| {
|
let mut handle_error = |error: &Report<EngineError>, engine_name: &'static str| {
|
||||||
log::error!("Engine Error: {:?}", error);
|
log::error!("Engine Error: {:?}", error);
|
||||||
engine_errors_info.push(EngineErrorInfo::new(
|
engine_errors_info.push(EngineErrorInfo::new(
|
||||||
error.downcast_ref::<EngineError>().unwrap(),
|
error.downcast_ref::<EngineError>().unwrap(),
|
||||||
@ -116,7 +122,7 @@ pub async fn aggregate(
|
|||||||
|
|
||||||
for _ in 0..responses.len() {
|
for _ in 0..responses.len() {
|
||||||
let response = responses.pop().unwrap();
|
let response = responses.pop().unwrap();
|
||||||
let engine = names.pop().unwrap().to_string();
|
let engine = names.pop().unwrap();
|
||||||
|
|
||||||
if result_map.is_empty() {
|
if result_map.is_empty() {
|
||||||
match response {
|
match response {
|
||||||
@ -124,7 +130,7 @@ pub async fn aggregate(
|
|||||||
result_map = results.clone();
|
result_map = results.clone();
|
||||||
}
|
}
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
handle_error(error, engine);
|
handle_error(&error, engine);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
@ -136,39 +142,37 @@ pub async fn aggregate(
|
|||||||
result_map
|
result_map
|
||||||
.entry(key)
|
.entry(key)
|
||||||
.and_modify(|result| {
|
.and_modify(|result| {
|
||||||
result.add_engines(engine.clone());
|
result.add_engines(engine);
|
||||||
})
|
})
|
||||||
.or_insert_with(|| -> SearchResult { value });
|
.or_insert_with(|| -> SearchResult { value });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
handle_error(error, engine);
|
handle_error(&error, engine);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut blacklist_map: HashMap<String, SearchResult> = HashMap::new();
|
if safe_search >= 3 {
|
||||||
filter_with_lists(
|
let mut blacklist_map: HashMap<String, SearchResult> = HashMap::new();
|
||||||
&mut result_map,
|
filter_with_lists(
|
||||||
&mut blacklist_map,
|
&mut result_map,
|
||||||
&file_path(FileType::BlockList)?,
|
&mut blacklist_map,
|
||||||
)?;
|
file_path(FileType::BlockList)?,
|
||||||
|
)?;
|
||||||
|
|
||||||
filter_with_lists(
|
filter_with_lists(
|
||||||
&mut blacklist_map,
|
&mut blacklist_map,
|
||||||
&mut result_map,
|
&mut result_map,
|
||||||
&file_path(FileType::AllowList)?,
|
file_path(FileType::AllowList)?,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
drop(blacklist_map);
|
drop(blacklist_map);
|
||||||
|
}
|
||||||
|
|
||||||
let results: Vec<SearchResult> = result_map.into_values().collect();
|
let results: Vec<SearchResult> = result_map.into_values().collect();
|
||||||
|
|
||||||
Ok(SearchResults::new(
|
Ok(SearchResults::new(results, query, &engine_errors_info))
|
||||||
results,
|
|
||||||
query.to_string(),
|
|
||||||
engine_errors_info,
|
|
||||||
))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Filters a map of search results using a list of regex patterns.
|
/// Filters a map of search results using a list of regex patterns.
|
||||||
@ -190,7 +194,7 @@ pub fn filter_with_lists(
|
|||||||
let mut reader = BufReader::new(File::open(file_path)?);
|
let mut reader = BufReader::new(File::open(file_path)?);
|
||||||
|
|
||||||
for line in reader.by_ref().lines() {
|
for line in reader.by_ref().lines() {
|
||||||
let re = Regex::new(&line?)?;
|
let re = Regex::new(line?.trim())?;
|
||||||
|
|
||||||
// Iterate over each search result in the map and check if it matches the regex pattern
|
// Iterate over each search result in the map and check if it matches the regex pattern
|
||||||
for (url, search_result) in map_to_be_filtered.clone().into_iter() {
|
for (url, search_result) in map_to_be_filtered.clone().into_iter() {
|
||||||
@ -199,7 +203,10 @@ pub fn filter_with_lists(
|
|||||||
|| re.is_match(&search_result.description.to_lowercase())
|
|| re.is_match(&search_result.description.to_lowercase())
|
||||||
{
|
{
|
||||||
// If the search result matches the regex pattern, move it from the original map to the resultant map
|
// If the search result matches the regex pattern, move it from the original map to the resultant map
|
||||||
resultant_map.insert(url.clone(), map_to_be_filtered.remove(&url).unwrap());
|
resultant_map.insert(
|
||||||
|
url.to_owned(),
|
||||||
|
map_to_be_filtered.remove(&url.to_owned()).unwrap(),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -210,6 +217,7 @@ pub fn filter_with_lists(
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
use smallvec::smallvec;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
use tempfile::NamedTempFile;
|
use tempfile::NamedTempFile;
|
||||||
@ -219,22 +227,22 @@ mod tests {
|
|||||||
// Create a map of search results to filter
|
// Create a map of search results to filter
|
||||||
let mut map_to_be_filtered = HashMap::new();
|
let mut map_to_be_filtered = HashMap::new();
|
||||||
map_to_be_filtered.insert(
|
map_to_be_filtered.insert(
|
||||||
"https://www.example.com".to_string(),
|
"https://www.example.com".to_owned(),
|
||||||
SearchResult {
|
SearchResult {
|
||||||
title: "Example Domain".to_string(),
|
title: "Example Domain".to_owned(),
|
||||||
url: "https://www.example.com".to_string(),
|
url: "https://www.example.com".to_owned(),
|
||||||
description: "This domain is for use in illustrative examples in documents."
|
description: "This domain is for use in illustrative examples in documents."
|
||||||
.to_string(),
|
.to_owned(),
|
||||||
engine: vec!["Google".to_string(), "Bing".to_string()],
|
engine: smallvec!["Google".to_owned(), "Bing".to_owned()],
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
map_to_be_filtered.insert(
|
map_to_be_filtered.insert(
|
||||||
"https://www.rust-lang.org/".to_string(),
|
"https://www.rust-lang.org/".to_owned(),
|
||||||
SearchResult {
|
SearchResult {
|
||||||
title: "Rust Programming Language".to_string(),
|
title: "Rust Programming Language".to_owned(),
|
||||||
url: "https://www.rust-lang.org/".to_string(),
|
url: "https://www.rust-lang.org/".to_owned(),
|
||||||
description: "A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.".to_string(),
|
description: "A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.".to_owned(),
|
||||||
engine: vec!["Google".to_string(), "DuckDuckGo".to_string()],
|
engine: smallvec!["Google".to_owned(), "DuckDuckGo".to_owned()],
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -263,22 +271,22 @@ mod tests {
|
|||||||
fn test_filter_with_lists_wildcard() -> Result<(), Box<dyn std::error::Error>> {
|
fn test_filter_with_lists_wildcard() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let mut map_to_be_filtered = HashMap::new();
|
let mut map_to_be_filtered = HashMap::new();
|
||||||
map_to_be_filtered.insert(
|
map_to_be_filtered.insert(
|
||||||
"https://www.example.com".to_string(),
|
"https://www.example.com".to_owned(),
|
||||||
SearchResult {
|
SearchResult {
|
||||||
title: "Example Domain".to_string(),
|
title: "Example Domain".to_owned(),
|
||||||
url: "https://www.example.com".to_string(),
|
url: "https://www.example.com".to_owned(),
|
||||||
description: "This domain is for use in illustrative examples in documents."
|
description: "This domain is for use in illustrative examples in documents."
|
||||||
.to_string(),
|
.to_owned(),
|
||||||
engine: vec!["Google".to_string(), "Bing".to_string()],
|
engine: smallvec!["Google".to_owned(), "Bing".to_owned()],
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
map_to_be_filtered.insert(
|
map_to_be_filtered.insert(
|
||||||
"https://www.rust-lang.org/".to_string(),
|
"https://www.rust-lang.org/".to_owned(),
|
||||||
SearchResult {
|
SearchResult {
|
||||||
title: "Rust Programming Language".to_string(),
|
title: "Rust Programming Language".to_owned(),
|
||||||
url: "https://www.rust-lang.org/".to_string(),
|
url: "https://www.rust-lang.org/".to_owned(),
|
||||||
description: "A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.".to_string(),
|
description: "A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.".to_owned(),
|
||||||
engine: vec!["Google".to_string(), "DuckDuckGo".to_string()],
|
engine: smallvec!["Google".to_owned(), "DuckDuckGo".to_owned()],
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -323,13 +331,13 @@ mod tests {
|
|||||||
fn test_filter_with_lists_invalid_regex() {
|
fn test_filter_with_lists_invalid_regex() {
|
||||||
let mut map_to_be_filtered = HashMap::new();
|
let mut map_to_be_filtered = HashMap::new();
|
||||||
map_to_be_filtered.insert(
|
map_to_be_filtered.insert(
|
||||||
"https://www.example.com".to_string(),
|
"https://www.example.com".to_owned(),
|
||||||
SearchResult {
|
SearchResult {
|
||||||
title: "Example Domain".to_string(),
|
title: "Example Domain".to_owned(),
|
||||||
url: "https://www.example.com".to_string(),
|
url: "https://www.example.com".to_owned(),
|
||||||
description: "This domain is for use in illustrative examples in documents."
|
description: "This domain is for use in illustrative examples in documents."
|
||||||
.to_string(),
|
.to_owned(),
|
||||||
engine: vec!["Google".to_string(), "Bing".to_string()],
|
engine: smallvec!["Google".to_owned(), "Bing".to_owned()],
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -1,30 +1,34 @@
|
|||||||
//! This module provides the functionality to generate random user agent string.
|
//! This module provides the functionality to generate random user agent string.
|
||||||
|
|
||||||
|
use std::sync::OnceLock;
|
||||||
|
|
||||||
use fake_useragent::{Browsers, UserAgents, UserAgentsBuilder};
|
use fake_useragent::{Browsers, UserAgents, UserAgentsBuilder};
|
||||||
|
|
||||||
/// A static variable which stores the initially build `UserAgents` struct. So as it can be resused
|
/// A static variable which stores the initially build `UserAgents` struct. So as it can be resused
|
||||||
/// again and again without the need of reinitializing the `UserAgents` struct.
|
/// again and again without the need of reinitializing the `UserAgents` struct.
|
||||||
static USER_AGENTS: once_cell::sync::Lazy<UserAgents> = once_cell::sync::Lazy::new(|| {
|
static USER_AGENTS: OnceLock<UserAgents> = OnceLock::new();
|
||||||
UserAgentsBuilder::new()
|
|
||||||
.cache(false)
|
|
||||||
.dir("/tmp")
|
|
||||||
.thread(1)
|
|
||||||
.set_browsers(
|
|
||||||
Browsers::new()
|
|
||||||
.set_chrome()
|
|
||||||
.set_safari()
|
|
||||||
.set_edge()
|
|
||||||
.set_firefox()
|
|
||||||
.set_mozilla(),
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
});
|
|
||||||
|
|
||||||
/// A function to generate random user agent to improve privacy of the user.
|
/// A function to generate random user agent to improve privacy of the user.
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
///
|
///
|
||||||
/// A randomly generated user agent string.
|
/// A randomly generated user agent string.
|
||||||
pub fn random_user_agent() -> String {
|
pub fn random_user_agent() -> &'static str {
|
||||||
USER_AGENTS.random().to_string()
|
USER_AGENTS
|
||||||
|
.get_or_init(|| {
|
||||||
|
UserAgentsBuilder::new()
|
||||||
|
.cache(false)
|
||||||
|
.dir("/tmp")
|
||||||
|
.thread(1)
|
||||||
|
.set_browsers(
|
||||||
|
Browsers::new()
|
||||||
|
.set_chrome()
|
||||||
|
.set_safari()
|
||||||
|
.set_edge()
|
||||||
|
.set_firefox()
|
||||||
|
.set_mozilla(),
|
||||||
|
)
|
||||||
|
.build()
|
||||||
|
})
|
||||||
|
.random()
|
||||||
}
|
}
|
||||||
|
@ -3,17 +3,73 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
cache::cacher::RedisCache,
|
cache::cacher::RedisCache,
|
||||||
config::parser::Config,
|
config::parser::Config,
|
||||||
models::{
|
handler::paths::{file_path, FileType},
|
||||||
aggregation_models::SearchResults,
|
models::{aggregation_models::SearchResults, engine_models::EngineHandler},
|
||||||
engine_models::EngineHandler,
|
|
||||||
server_models::{Cookie, SearchParams},
|
|
||||||
},
|
|
||||||
results::aggregator::aggregate,
|
results::aggregator::aggregate,
|
||||||
};
|
};
|
||||||
use actix_web::{get, web, HttpRequest, HttpResponse};
|
use actix_web::{get, web, HttpRequest, HttpResponse};
|
||||||
use handlebars::Handlebars;
|
use handlebars::Handlebars;
|
||||||
|
use regex::Regex;
|
||||||
|
use serde::Deserialize;
|
||||||
|
use std::{
|
||||||
|
fs::{read_to_string, File},
|
||||||
|
io::{BufRead, BufReader, Read},
|
||||||
|
};
|
||||||
use tokio::join;
|
use tokio::join;
|
||||||
|
|
||||||
|
// ---- Constants ----
|
||||||
|
/// Initialize redis cache connection once and store it on the heap.
|
||||||
|
static REDIS_CACHE: async_once_cell::OnceCell<RedisCache> = async_once_cell::OnceCell::new();
|
||||||
|
|
||||||
|
/// A named struct which deserializes all the user provided search parameters and stores them.
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct SearchParams {
|
||||||
|
/// It stores the search parameter option `q` (or query in simple words)
|
||||||
|
/// of the search url.
|
||||||
|
q: Option<String>,
|
||||||
|
/// It stores the search parameter `page` (or pageno in simple words)
|
||||||
|
/// of the search url.
|
||||||
|
page: Option<u32>,
|
||||||
|
/// It stores the search parameter `safesearch` (or safe search level in simple words) of the
|
||||||
|
/// search url.
|
||||||
|
safesearch: Option<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handles the route of index page or main page of the `websurfx` meta search engine website.
|
||||||
|
#[get("/")]
|
||||||
|
pub async fn index(
|
||||||
|
hbs: web::Data<Handlebars<'_>>,
|
||||||
|
config: web::Data<Config>,
|
||||||
|
) -> Result<HttpResponse, Box<dyn std::error::Error>> {
|
||||||
|
let page_content: String = hbs.render("index", &config.style).unwrap();
|
||||||
|
Ok(HttpResponse::Ok().body(page_content))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handles the route of any other accessed route/page which is not provided by the
|
||||||
|
/// website essentially the 404 error page.
|
||||||
|
pub async fn not_found(
|
||||||
|
hbs: web::Data<Handlebars<'_>>,
|
||||||
|
config: web::Data<Config>,
|
||||||
|
) -> Result<HttpResponse, Box<dyn std::error::Error>> {
|
||||||
|
let page_content: String = hbs.render("404", &config.style)?;
|
||||||
|
|
||||||
|
Ok(HttpResponse::Ok()
|
||||||
|
.content_type("text/html; charset=utf-8")
|
||||||
|
.body(page_content))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A named struct which is used to deserialize the cookies fetched from the client side.
|
||||||
|
#[allow(dead_code)]
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct Cookie<'a> {
|
||||||
|
/// It stores the theme name used in the website.
|
||||||
|
theme: &'a str,
|
||||||
|
/// It stores the colorscheme name used for the website theme.
|
||||||
|
colorscheme: &'a str,
|
||||||
|
/// It stores the user selected upstream search engines selected from the UI.
|
||||||
|
engines: Vec<&'a str>,
|
||||||
|
}
|
||||||
|
|
||||||
/// Handles the route of search page of the `websurfx` meta search engine website and it takes
|
/// Handles the route of search page of the `websurfx` meta search engine website and it takes
|
||||||
/// two search url parameters `q` and `page` where `page` parameter is optional.
|
/// two search url parameters `q` and `page` where `page` parameter is optional.
|
||||||
///
|
///
|
||||||
@ -47,42 +103,58 @@ pub async fn search(
|
|||||||
None => 1,
|
None => 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let safe_search: u8 = match config.safe_search {
|
||||||
|
3..=4 => config.safe_search,
|
||||||
|
_ => match ¶ms.safesearch {
|
||||||
|
Some(safesearch) => match safesearch {
|
||||||
|
0..=2 => *safesearch,
|
||||||
|
_ => 1,
|
||||||
|
},
|
||||||
|
None => config.safe_search,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
let (_, results, _) = join!(
|
let (_, results, _) = join!(
|
||||||
results(
|
results(
|
||||||
format!(
|
format!(
|
||||||
"http://{}:{}/search?q={}&page={}",
|
"http://{}:{}/search?q={}&page={}&safesearch={}",
|
||||||
config.binding_ip,
|
config.binding_ip,
|
||||||
config.port,
|
config.port,
|
||||||
query,
|
query,
|
||||||
page - 1
|
page - 1,
|
||||||
|
safe_search
|
||||||
),
|
),
|
||||||
&config,
|
&config,
|
||||||
query.to_string(),
|
query,
|
||||||
page - 1,
|
page - 1,
|
||||||
req.clone(),
|
req.clone(),
|
||||||
|
safe_search
|
||||||
),
|
),
|
||||||
results(
|
results(
|
||||||
format!(
|
format!(
|
||||||
"http://{}:{}/search?q={}&page={}",
|
"http://{}:{}/search?q={}&page={}&safesearch={}",
|
||||||
config.binding_ip, config.port, query, page
|
config.binding_ip, config.port, query, page, safe_search
|
||||||
),
|
),
|
||||||
&config,
|
&config,
|
||||||
query.to_string(),
|
query,
|
||||||
page,
|
page,
|
||||||
req.clone(),
|
req.clone(),
|
||||||
|
safe_search
|
||||||
),
|
),
|
||||||
results(
|
results(
|
||||||
format!(
|
format!(
|
||||||
"http://{}:{}/search?q={}&page={}",
|
"http://{}:{}/search?q={}&page={}&safesearch={}",
|
||||||
config.binding_ip,
|
config.binding_ip,
|
||||||
config.port,
|
config.port,
|
||||||
query,
|
query,
|
||||||
page + 1
|
page + 1,
|
||||||
|
safe_search
|
||||||
),
|
),
|
||||||
&config,
|
&config,
|
||||||
query.to_string(),
|
query,
|
||||||
page + 1,
|
page + 1,
|
||||||
req.clone(),
|
req.clone(),
|
||||||
|
safe_search
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -113,28 +185,54 @@ pub async fn search(
|
|||||||
async fn results(
|
async fn results(
|
||||||
url: String,
|
url: String,
|
||||||
config: &Config,
|
config: &Config,
|
||||||
query: String,
|
query: &str,
|
||||||
page: u32,
|
page: u32,
|
||||||
req: HttpRequest,
|
req: HttpRequest,
|
||||||
|
safe_search: u8,
|
||||||
) -> Result<SearchResults, Box<dyn std::error::Error>> {
|
) -> Result<SearchResults, Box<dyn std::error::Error>> {
|
||||||
// Initialize redis cache connection struct
|
// Initialize redis cache connection struct
|
||||||
let mut redis_cache = RedisCache::new(config.redis_url.clone())?;
|
let mut redis_cache: RedisCache = REDIS_CACHE
|
||||||
|
.get_or_init(async {
|
||||||
|
// Initialize redis cache connection pool only one and store it in the heap.
|
||||||
|
RedisCache::new(&config.redis_url, 5).await.unwrap()
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.clone();
|
||||||
// fetch the cached results json.
|
// fetch the cached results json.
|
||||||
let cached_results_json = redis_cache.cached_json(&url);
|
let cached_results_json: Result<String, error_stack::Report<crate::cache::error::PoolError>> =
|
||||||
|
redis_cache.clone().cached_json(&url).await;
|
||||||
// check if fetched cache results was indeed fetched or it was an error and if so
|
// check if fetched cache results was indeed fetched or it was an error and if so
|
||||||
// handle the data accordingly.
|
// handle the data accordingly.
|
||||||
match cached_results_json {
|
match cached_results_json {
|
||||||
Ok(results) => Ok(serde_json::from_str::<SearchResults>(&results).unwrap()),
|
Ok(results) => Ok(serde_json::from_str::<SearchResults>(&results)?),
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
|
if safe_search == 4 {
|
||||||
|
let mut results: SearchResults = SearchResults::default();
|
||||||
|
let mut _flag: bool =
|
||||||
|
is_match_from_filter_list(file_path(FileType::BlockList)?, query)?;
|
||||||
|
_flag = !is_match_from_filter_list(file_path(FileType::AllowList)?, query)?;
|
||||||
|
|
||||||
|
if _flag {
|
||||||
|
results.set_disallowed();
|
||||||
|
results.add_style(&config.style);
|
||||||
|
results.set_page_query(query);
|
||||||
|
redis_cache
|
||||||
|
.cache_results(&serde_json::to_string(&results)?, &url)
|
||||||
|
.await?;
|
||||||
|
return Ok(results);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// check if the cookie value is empty or not if it is empty then use the
|
// check if the cookie value is empty or not if it is empty then use the
|
||||||
// default selected upstream search engines from the config file otherwise
|
// default selected upstream search engines from the config file otherwise
|
||||||
// parse the non-empty cookie and grab the user selected engines from the
|
// parse the non-empty cookie and grab the user selected engines from the
|
||||||
// UI and use that.
|
// UI and use that.
|
||||||
let mut results: SearchResults = match req.cookie("appCookie") {
|
let mut results: SearchResults = match req.cookie("appCookie") {
|
||||||
Some(cookie_value) => {
|
Some(cookie_value) => {
|
||||||
let cookie_value: Cookie = serde_json::from_str(cookie_value.name_value().1)?;
|
let cookie_value: Cookie<'_> =
|
||||||
|
serde_json::from_str(cookie_value.name_value().1)?;
|
||||||
|
|
||||||
let engines = cookie_value
|
let engines: Vec<EngineHandler> = cookie_value
|
||||||
.engines
|
.engines
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|name| EngineHandler::new(name))
|
.filter_map(|name| EngineHandler::new(name))
|
||||||
@ -145,8 +243,9 @@ async fn results(
|
|||||||
page,
|
page,
|
||||||
config.aggregator.random_delay,
|
config.aggregator.random_delay,
|
||||||
config.debug,
|
config.debug,
|
||||||
engines,
|
&engines,
|
||||||
config.request_timeout,
|
config.request_timeout,
|
||||||
|
safe_search,
|
||||||
)
|
)
|
||||||
.await?
|
.await?
|
||||||
}
|
}
|
||||||
@ -156,15 +255,69 @@ async fn results(
|
|||||||
page,
|
page,
|
||||||
config.aggregator.random_delay,
|
config.aggregator.random_delay,
|
||||||
config.debug,
|
config.debug,
|
||||||
config.upstream_search_engines.clone(),
|
&config.upstream_search_engines,
|
||||||
config.request_timeout,
|
config.request_timeout,
|
||||||
|
safe_search,
|
||||||
)
|
)
|
||||||
.await?
|
.await?
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
results.add_style(config.style.clone());
|
if results.engine_errors_info().is_empty() && results.results().is_empty() {
|
||||||
redis_cache.cache_results(serde_json::to_string(&results)?, &url)?;
|
results.set_filtered();
|
||||||
|
}
|
||||||
|
results.add_style(&config.style);
|
||||||
|
redis_cache
|
||||||
|
.cache_results(&serde_json::to_string(&results)?, &url)
|
||||||
|
.await?;
|
||||||
Ok(results)
|
Ok(results)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A helper function which checks whether the search query contains any keywords which should be
|
||||||
|
/// disallowed/allowed based on the regex based rules present in the blocklist and allowlist files.
|
||||||
|
fn is_match_from_filter_list(
|
||||||
|
file_path: &str,
|
||||||
|
query: &str,
|
||||||
|
) -> Result<bool, Box<dyn std::error::Error>> {
|
||||||
|
let mut flag = false;
|
||||||
|
let mut reader = BufReader::new(File::open(file_path)?);
|
||||||
|
for line in reader.by_ref().lines() {
|
||||||
|
let re = Regex::new(&line?)?;
|
||||||
|
if re.is_match(query) {
|
||||||
|
flag = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(flag)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handles the route of robots.txt page of the `websurfx` meta search engine website.
|
||||||
|
#[get("/robots.txt")]
|
||||||
|
pub async fn robots_data(_req: HttpRequest) -> Result<HttpResponse, Box<dyn std::error::Error>> {
|
||||||
|
let page_content: String =
|
||||||
|
read_to_string(format!("{}/robots.txt", file_path(FileType::Theme)?))?;
|
||||||
|
Ok(HttpResponse::Ok()
|
||||||
|
.content_type("text/plain; charset=ascii")
|
||||||
|
.body(page_content))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handles the route of about page of the `websurfx` meta search engine website.
|
||||||
|
#[get("/about")]
|
||||||
|
pub async fn about(
|
||||||
|
hbs: web::Data<Handlebars<'_>>,
|
||||||
|
config: web::Data<Config>,
|
||||||
|
) -> Result<HttpResponse, Box<dyn std::error::Error>> {
|
||||||
|
let page_content: String = hbs.render("about", &config.style)?;
|
||||||
|
Ok(HttpResponse::Ok().body(page_content))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handles the route of settings page of the `websurfx` meta search engine website.
|
||||||
|
#[get("/settings")]
|
||||||
|
pub async fn settings(
|
||||||
|
hbs: web::Data<Handlebars<'_>>,
|
||||||
|
config: web::Data<Config>,
|
||||||
|
) -> Result<HttpResponse, Box<dyn std::error::Error>> {
|
||||||
|
let page_content: String = hbs.render("settings", &config.style)?;
|
||||||
|
Ok(HttpResponse::Ok().body(page_content))
|
||||||
|
}
|
||||||
|
@ -10,6 +10,21 @@ production_use = false -- whether to use production mode or not (in other words
|
|||||||
-- if production_use is set to true
|
-- if production_use is set to true
|
||||||
-- There will be a random delay before sending the request to the search engines, this is to prevent DDoSing the upstream search engines from a large number of simultaneous requests.
|
-- There will be a random delay before sending the request to the search engines, this is to prevent DDoSing the upstream search engines from a large number of simultaneous requests.
|
||||||
request_timeout = 30 -- timeout for the search requests sent to the upstream search engines to be fetched (value in seconds).
|
request_timeout = 30 -- timeout for the search requests sent to the upstream search engines to be fetched (value in seconds).
|
||||||
|
rate_limiter = {
|
||||||
|
number_of_requests = 20, -- The number of request that are allowed within a provided time limit.
|
||||||
|
time_limit = 3, -- The time limit in which the quantity of requests that should be accepted.
|
||||||
|
}
|
||||||
|
|
||||||
|
-- ### Search ###
|
||||||
|
-- Filter results based on different levels. The levels provided are:
|
||||||
|
-- {{
|
||||||
|
-- 0 - None
|
||||||
|
-- 1 - Low
|
||||||
|
-- 2 - Moderate
|
||||||
|
-- 3 - High
|
||||||
|
-- 4 - Aggressive
|
||||||
|
-- }}
|
||||||
|
safe_search = 2
|
||||||
|
|
||||||
-- ### Website ###
|
-- ### Website ###
|
||||||
-- The different colorschemes provided are:
|
-- The different colorschemes provided are:
|
||||||
@ -34,4 +49,7 @@ theme = "simple" -- the theme name which should be used for the website
|
|||||||
redis_url = "redis://127.0.0.1:8082" -- redis connection url address on which the client should connect on.
|
redis_url = "redis://127.0.0.1:8082" -- redis connection url address on which the client should connect on.
|
||||||
|
|
||||||
-- ### Search Engines ###
|
-- ### Search Engines ###
|
||||||
upstream_search_engines = { DuckDuckGo = true, Searx = false } -- select the upstream search engines from which the results should be fetched.
|
upstream_search_engines = {
|
||||||
|
DuckDuckGo = true,
|
||||||
|
Searx = false,
|
||||||
|
} -- select the upstream search engines from which the results should be fetched.
|
||||||
|
Loading…
Reference in New Issue
Block a user