Neshura/cloudflare-dns-updater
Neshura/cloudflare-dns-updater
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 38 Packages Activity Actions

Add status code check for get request

Browse source 
potential fix for #17
This commit is contained in:
Neshura 2023-03-21 10:41:27 +01:00
parent f2667c4d76
commit 2287e8da9d
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C
1 changed files with 100 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
src/cloudflare/mod.rs
View file

@ -1,20 +1,24 @@
use reqwest::{blocking::{Response, Client}, Url}; use reqwest::{
blocking::{Client, Response},
Url,
};
use reqwest::{
header::{HeaderMap, HeaderValue},
Error,
};
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
use reqwest::{Error, header::{HeaderMap, HeaderValue}}; use std::{collections::HashMap, string::String};
use std::{string::String, collections::HashMap};
use strum_macros::{Display, IntoStaticStr}; use strum_macros::{Display, IntoStaticStr};
const API_BASE: &str = "https://api.cloudflare.com/client/v4/"; const API_BASE: &str = "https://api.cloudflare.com/client/v4/";
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
struct CloudflareDnsZone { struct CloudflareDnsZone {
result: Vec<CloudflareDnsEntry>, result: Vec<CloudflareDnsEntry>,
success: bool success: bool,
} }
#[derive(Serialize, Deserialize, PartialEq, Debug, Clone, Copy)] #[derive(Serialize, Deserialize, PartialEq, Debug, Clone, Copy, Display, IntoStaticStr)]
#[derive(Display, IntoStaticStr)]
pub enum CloudflareDnsType { pub enum CloudflareDnsType {
#[strum(serialize = "A")] #[strum(serialize = "A")]
A = 4, A = 4,
@ -22,7 +26,7 @@ pub enum CloudflareDnsType {
AAAA = 6, AAAA = 6,
TXT, TXT,
MX, MX,
CAA CAA,
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
@ -32,24 +36,31 @@ pub struct CloudflareDnsEntry {
pub name: String, pub name: String,
pub r#type: CloudflareDnsType, pub r#type: CloudflareDnsType,
content: String, content: String,
proxied: bool proxied: bool,
} }
impl CloudflareDnsEntry { impl CloudflareDnsEntry {
pub fn is_equal(&self, other_entry: &String) -> bool { pub fn is_equal(&self, other_entry: &String) -> bool {
return if &self.name == other_entry { true } else { false }; return if &self.name == other_entry {
true
} else {
false
};
} }
pub fn is_ip_new(&self, other_entry: &String) -> bool { pub fn is_ip_new(&self, other_entry: &String) -> bool {
return if &self.content == other_entry { false } else { true }; return if &self.content == other_entry {
false
} else {
true
};
} }
} }
pub(crate) struct Instance { pub(crate) struct Instance {
api_key: String, api_key: String,
pub dns_entries: Vec<CloudflareDnsEntry>, pub dns_entries: Vec<CloudflareDnsEntry>,
dns_email: String dns_email: String,
} }
impl Instance { impl Instance {
@ -57,7 +68,7 @@ impl Instance {
Instance { Instance {
api_key: key.clone(), api_key: key.clone(),
dns_entries: Vec::new(), dns_entries: Vec::new(),
dns_email: "".to_string() dns_email: "".to_string(),
} }
} }
@ -72,22 +83,27 @@ impl Instance {
match self.get(&endpoint) { match self.get(&endpoint) {
Ok(response) => { Ok(response) => {
let entries = match response if response.status().is_success() {
.json::<CloudflareDnsZone>() { let entries = match response.json::<CloudflareDnsZone>() {
Ok(data) => {data}, Ok(data) => data,
Err(e) => panic!("{:#?}", e) Err(e) => {
panic!("{:#?}", e)
}
}; };
for entry in entries.result { for entry in entries.result {
self.dns_entries.append(&mut vec!(entry)); self.dns_entries.append(&mut vec![entry]);
} }
return Ok(()) return Ok(());
}, }
Err(e) => { return Err(e) } else {
println!("Server returned Status Code: {}", response.status());
return Err(response.error_for_status().err().unwrap());
}
}
Err(e) => return Err(e),
} }
} }
/// Shorthand for Cloudflare API Requests /// Shorthand for Cloudflare API Requests
@ -97,17 +113,14 @@ impl Instance {
/// * `url` : URL for the request, will be parsed to [`Url`] /// * `url` : URL for the request, will be parsed to [`Url`]
fn get(&self, url: &str) -> Result<Response, Error> { fn get(&self, url: &str) -> Result<Response, Error> {
let url_parsed = match Url::parse(url) { let url_parsed = match Url::parse(url) {
Ok(url) => {url}, Ok(url) => url,
Err(e) => panic!("{:#?}", e) // If this call fails the API changed Err(e) => panic!("{:#?}", e), // If this call fails the API changed
}; // Continuing without a code update is not possible }; // Continuing without a code update is not possible
let result = match Client::new() let result = Client::new()
.get(url_parsed) .get(url_parsed)
.headers(self.generate_headers()) .headers(self.generate_headers())
.send() { .send();
Ok(res) => { Ok(res) },
Err(e) => { Err(e) }
};
return result; return result;
} }
@ -120,17 +133,18 @@ impl Instance {
/// * `data` : PUT request body /// * `data` : PUT request body
fn put(&self, url: &str, data: &HashMap<&str, &str>) -> Result<Response, Error> { fn put(&self, url: &str, data: &HashMap<&str, &str>) -> Result<Response, Error> {
let url_parsed = match Url::parse(url) { let url_parsed = match Url::parse(url) {
Ok(url) => {url}, Ok(url) => url,
Err(e) => panic!("{:#?}", e)// If this call fails the API changed Err(e) => panic!("{:#?}", e), // If this call fails the API changed
}; // Continuing without a code update is not possible }; // Continuing without a code update is not possible
let result = match Client::new() let result = match Client::new()
.put(url_parsed) .put(url_parsed)
.headers(self.generate_headers()) .headers(self.generate_headers())
.json(data) .json(data)
.send() { .send()
Ok(res) => { Ok(res) }, {
Err(e) => { Err(e) } Ok(res) => Ok(res),
Err(e) => Err(e),
}; };
return result; return result;
@ -144,17 +158,18 @@ impl Instance {
/// * `data` : POST request body /// * `data` : POST request body
fn post(&self, url: &str, data: &HashMap<&str, &str>) -> Result<Response, Error> { fn post(&self, url: &str, data: &HashMap<&str, &str>) -> Result<Response, Error> {
let url_parsed = match Url::parse(url) { let url_parsed = match Url::parse(url) {
Ok(url) => {url}, Ok(url) => url,
Err(e) => panic!("{:#?}", e) // If this call fails the API changed Err(e) => panic!("{:#?}", e), // If this call fails the API changed
}; // Continuing without a code update is not possible }; // Continuing without a code update is not possible
let result = match Client::new() let result = match Client::new()
.post(url_parsed) .post(url_parsed)
.headers(self.generate_headers()) .headers(self.generate_headers())
.json(data) .json(data)
.send() { .send()
Ok(res) => { Ok(res) }, {
Err(e) => { Err(e) } Ok(res) => Ok(res),
Err(e) => Err(e),
}; };
return result; return result;
@ -166,7 +181,10 @@ impl Instance {
/// * `new_ip` : IP used to Update the DNS entry, can be IPv4 or IPv6 /// * `new_ip` : IP used to Update the DNS entry, can be IPv4 or IPv6
/// * `return1` : Returns success of the API call, extracted from the HTTP Response body /// * `return1` : Returns success of the API call, extracted from the HTTP Response body
pub fn update_entry(&self, entry: &CloudflareDnsEntry, new_ip: &String) -> Result<bool, Error> { pub fn update_entry(&self, entry: &CloudflareDnsEntry, new_ip: &String) -> Result<bool, Error> {
let endpoint = format!("{}zones/{}/dns_records/{}", API_BASE, entry.zone_id, entry.id); let endpoint = format!(
"{}zones/{}/dns_records/{}",
API_BASE, entry.zone_id, entry.id
);
let mut json_body = HashMap::new(); let mut json_body = HashMap::new();
json_body.insert("type", entry.r#type.clone().into()); json_body.insert("type", entry.r#type.clone().into());
@ -184,12 +202,18 @@ impl Instance {
.as_bool() .as_bool()
.expect("JSON should always include success bool"); .expect("JSON should always include success bool");
return Ok(success); return Ok(success);
}, }
Err(e) => { return Err(e) }, Err(e) => return Err(e),
} }
} }
pub fn create_entry(&self, zone_id: &String, r#type: &str, name: &str, ip: &String) -> Result<bool, Error> { pub fn create_entry(
&self,
zone_id: &String,
r#type: &str,
name: &str,
ip: &String,
) -> Result<bool, Error> {
let endpoint = format!("{}zones/{}/dns_records", API_BASE, zone_id); let endpoint = format!("{}zones/{}/dns_records", API_BASE, zone_id);
let mut json_body = HashMap::new(); let mut json_body = HashMap::new();
@ -208,18 +232,23 @@ impl Instance {
.as_bool() .as_bool()
.expect("JSON should always include success bool"); .expect("JSON should always include success bool");
return Ok(success) return Ok(success);
}, }
Err(e) => { return Err(e) }, Err(e) => return Err(e),
} }
} }
/// Generate Cloudflare API v4 Auth Headers /// Generate Cloudflare API v4 Auth Headers
fn generate_headers(&self) -> HeaderMap { fn generate_headers(&self) -> HeaderMap {
let mut headers = HeaderMap::new(); let mut headers = HeaderMap::new();
headers.insert("X-Auth-Key", HeaderValue::from_str(self.api_key.as_ref()).unwrap()); headers.insert(
headers.insert("X-Auth-Email", HeaderValue::from_str(self.dns_email.as_ref()).unwrap()); "X-Auth-Key",
HeaderValue::from_str(self.api_key.as_ref()).unwrap(),
);
headers.insert(
"X-Auth-Email",
HeaderValue::from_str(self.dns_email.as_ref()).unwrap(),
);
headers headers
} }
} }