Skip to content

Running sentry tests no longer hits redis rate limit #372

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Mar 12, 2021
Merged

Running sentry tests no longer hits redis rate limit #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fe00684
added SELECT query for each test
simzzz Jan 6, 2021
7a960d5
tests now always pass
simzzz Jan 22, 2021
2713fad
merged dev
simzzz Jan 22, 2021
82ecc45
reverted bad merge
simzzz Jan 22, 2021
d2924fa
tests now pass
simzzz Jan 22, 2021
eeaf7ec
Revert "merged dev"
simzzz Jan 22, 2021
af6538c
Putting passing tests again
simzzz Jan 22, 2021
030b7e4
replaced FLUSHALL with FLUSHDB, all tests are passing, removed serial…
simzzz Jan 25, 2021
f100484
fixed comment
simzzz Jan 25, 2021
763fad0
added SELECT + FLUSHDB to auth module redis tests
simzzz Jan 25, 2021
329b9e5
Pushing current progress
simzzz Feb 2, 2021
ea6e206
minor improvements
simzzz Feb 3, 2021
6b2801b
removed comment + changed where make_unavailable() is called
simzzz Feb 4, 2021
78ea5fd
removed unnecessary semi-colon
simzzz Feb 4, 2021
6cf7ada
commented out SELECT and moved FLUSHDB to recycle
simzzz Feb 4, 2021
e7bb2ff
WIP sentry - redis pool for tests
elpiel Feb 4, 2021
01051d4
sentry - db - Redis Pool for tests - fix `broken pipe` error
elpiel Feb 22, 2021
1eac05a
Merge pull request #374 from AdExNetwork/rate-limit-redis-pool
elpiel Mar 4, 2021
b0d53e6
fixed redis connection in auth.rs integration tests
simzzz Mar 10, 2021
cdd8b30
used cargo fmt and clippy
simzzz Mar 10, 2021
0abf78f
Merge branch 'dev' into issue-357-rate-limit-in-tests
elpiel Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions sentry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ async-trait = "^0.1"
primitives = { path = "../primitives", features = ["postgres"] }
adapter = { version = "0.1", path = "../adapter" }
chrono = { version = "0.4", features = ["serde"] }
dashmap = "4"
hex = "0.4"
# CLI
clap = "^2.33"
Expand All @@ -36,3 +37,5 @@ serde_urlencoded = "^0.7"
# Other
lazy_static = "1.4.0"
thiserror = "^1.0"
deadpool = "0.7.0"
once_cell = "1.5.2"
103 changes: 47 additions & 56 deletions sentry/src/access.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,28 +210,29 @@ mod test {
use std::time::Duration;

use chrono::TimeZone;
use primitives::config::configuration;
use primitives::event_submission::{RateLimit, Rule};
use primitives::sentry::Event;
use primitives::targeting::Rules;
use primitives::util::tests::prep_db::{DUMMY_CHANNEL, IDS};
use primitives::{Channel, Config, EventSubmission};
use primitives::{
config::configuration,
event_submission::{RateLimit, Rule},
sentry::Event,
targeting::Rules,
util::tests::prep_db::{DUMMY_CHANNEL, IDS},
Channel, Config, EventSubmission,
};

use deadpool::managed::Object;

use crate::db::redis_connection;
use crate::Session;
use crate::{
db::redis_pool::{Database, TESTS_POOL},
Session,
};

use super::*;

async fn setup() -> (Config, MultiplexedConnection) {
let mut redis = redis_connection().await.expect("Couldn't connect to Redis");
async fn setup() -> (Config, Object<Database, crate::db::redis_pool::Error>) {
let connection = TESTS_POOL.get().await.expect("Should return Object");
let config = configuration("development", None).expect("Failed to get dev configuration");

// run `FLUSHALL` to clean any leftovers of other tests
let _ = redis::cmd("FLUSHALL")
.query_async::<_, String>(&mut redis)
.await;

(config, redis)
(config, connection)
}

fn get_channel(with_rule: Rule) -> Channel {
Expand Down Expand Up @@ -269,7 +270,7 @@ mod test {

#[tokio::test]
async fn session_uid_rate_limit() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -294,7 +295,7 @@ mod test {
let channel = get_channel(rule);

let response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -305,7 +306,7 @@ mod test {
assert_eq!(Ok(()), response);

let err_response = check_access(
&&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -323,7 +324,7 @@ mod test {

#[tokio::test]
async fn ip_rate_limit() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -347,7 +348,7 @@ mod test {
let channel = get_channel(rule);

let err_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -364,7 +365,7 @@ mod test {
);

let response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -376,9 +377,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn check_access_past_channel_valid_until() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -403,7 +403,7 @@ mod test {
channel.valid_until = Utc.ymd(1970, 1, 1).and_hms(12, 00, 9);

let err_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -416,9 +416,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn check_access_close_event_in_withdraw_period() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -443,7 +442,7 @@ mod test {
channel.spec.withdraw_period_start = Utc.ymd(1970, 1, 1).and_hms(12, 0, 9);

let ok_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -456,9 +455,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn check_access_close_event_and_is_creator() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -483,7 +481,7 @@ mod test {
channel.creator = IDS["follower"];

let ok_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -496,9 +494,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn check_access_update_targeting_event_and_is_creator() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -523,7 +520,7 @@ mod test {
channel.creator = IDS["follower"];

let ok_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -536,9 +533,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn not_creator_and_there_are_close_events() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand Down Expand Up @@ -574,7 +570,7 @@ mod test {
},
];
let err_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -587,9 +583,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn not_creator_and_there_are_update_targeting_events() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand Down Expand Up @@ -624,7 +619,7 @@ mod test {
},
];
let err_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -637,9 +632,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn in_withdraw_period_no_close_events() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -664,7 +658,7 @@ mod test {
channel.spec.withdraw_period_start = Utc.ymd(1970, 1, 1).and_hms(12, 0, 9);

let err_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -677,9 +671,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn with_forbidden_country() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -703,7 +696,7 @@ mod test {
let channel = get_channel(rule);

let err_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -716,9 +709,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn with_forbidden_referrer() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -742,7 +734,7 @@ mod test {
let channel = get_channel(rule);

let err_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -755,9 +747,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn no_rate_limit() {
let (config, redis) = setup().await;
let (config, database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -778,7 +769,7 @@ mod test {
let channel = get_channel(rule);

let ok_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -791,9 +782,8 @@ mod test {
}

#[tokio::test]
#[ignore]
async fn applied_rules() {
let (config, redis) = setup().await;
let (config, mut database) = setup().await;

let auth = Auth {
era: 0,
Expand All @@ -817,7 +807,7 @@ mod test {
let channel = get_channel(rule);

let ok_response = check_access(
&redis,
&database,
&session,
Some(&auth),
&config.ip_rate_limit,
Expand All @@ -833,7 +823,8 @@ mod test {

let value_in_redis = redis::cmd("GET")
.arg(&key)
.query_async::<_, String>(&mut redis.clone())
// Deref can't work here, so we need to call the `Object` -> `Database.connection`
.query_async::<_, String>(&mut database.connection)
.await
.expect("should exist in redis");
assert_eq!(&value, &value_in_redis);
Expand Down
Loading