tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove src/tools/common_regex.rs, use proxmox::tools::common_regex instead

Browse Source
This commit is contained in:
Dietmar Maurer 2019-08-03 16:44:31 +02:00
parent fd329bdcd7
commit 7f66c29e5c
5 changed files with 5 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api2/node/dns.rs
View File

@ -1,6 +1,8 @@
use failure::*; use failure::*;
use proxmox::tools::fs::{file_get_contents, file_set_contents}; use proxmox::tools::fs::{file_get_contents, file_set_contents};
use proxmox::tools::*; // required to use IPRE!() macro ???
use crate::api2::*; use crate::api2::*;
use crate::api_schema::*; use crate::api_schema::*;
//use crate::api_schema::router::*; //use crate::api_schema::router::*;

2
src/api2/node/syslog.rs
View File

@ -8,7 +8,7 @@ use serde_json::{json, Value};
use std::sync::Arc; use std::sync::Arc;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use crate::tools::common_regex; use proxmox::tools::common_regex;
use std::process::{Command, Stdio}; use std::process::{Command, Stdio};
fn dump_journal( fn dump_journal(

4
src/api2/types.rs
View File

@ -3,7 +3,7 @@ use lazy_static::lazy_static;
use std::sync::Arc; use std::sync::Arc;
use crate::api_schema::*; use crate::api_schema::*;
use crate::tools::{self, common_regex}; use proxmox::tools::common_regex;
lazy_static!{ lazy_static!{
@ -38,7 +38,7 @@ lazy_static!{
StringSchema::new("Node name (or 'localhost')") StringSchema::new("Node name (or 'localhost')")
.format( .format(
Arc::new(ApiStringFormat::VerifyFn(|node| { Arc::new(ApiStringFormat::VerifyFn(|node| {
if node == "localhost" || node == tools::nodename() { if node == "localhost" || node == crate::tools::nodename() {
Ok(()) Ok(())
} else { } else {
bail!("no such node '{}'", node); bail!("no such node '{}'", node);

2
src/tools.rs
View File

@ -22,8 +22,6 @@ use proxmox::tools::vec;
pub mod async_mutex; pub mod async_mutex;
pub mod timer; pub mod timer;
pub mod wrapped_reader_stream; pub mod wrapped_reader_stream;
#[macro_use]
pub mod common_regex;
pub mod ticket; pub mod ticket;
pub mod borrow; pub mod borrow;
pub mod fs; pub mod fs;

47
src/tools/common_regex.rs
View File

@ -1,47 +0,0 @@
//! Predefined Regular Expressions
//!
//! This is a collection of useful regular expressions
use lazy_static::lazy_static;
use regex::Regex;
#[macro_export]
macro_rules! IPV4OCTET { () => (r"(?:25[0-5]|(?:2[0-4]|1[0-9]|[1-9])?[0-9])") }
#[macro_export]
macro_rules! IPV6H16 { () => (r"(?:[0-9a-fA-F]{1,4})") }
#[macro_export]
macro_rules! IPV6LS32 { () => (concat!(r"(?:(?:", IPV4RE!(), "|", IPV6H16!(), ":", IPV6H16!(), "))" )) }
/// Returns the regular expression string to match IPv4 addresses
#[macro_export]
macro_rules! IPV4RE { () => (concat!(r"(?:(?:", IPV4OCTET!(), r"\.){3}", IPV4OCTET!(), ")")) }
/// Returns the regular expression string to match IPv6 addresses
#[macro_export]
macro_rules! IPV6RE { () => (concat!(r"(?:",
r"(?:(?:", r"(?:", IPV6H16!(), r":){6})", IPV6LS32!(), r")|",
r"(?:(?:", r"::(?:", IPV6H16!(), r":){5})", IPV6LS32!(), r")|",
r"(?:(?:(?:", IPV6H16!(), r")?::(?:", IPV6H16!(), r":){4})", IPV6LS32!(), r")|",
r"(?:(?:(?:(?:", IPV6H16!(), r":){0,1}", IPV6H16!(), r")?::(?:", IPV6H16!(), r":){3})", IPV6LS32!(), r")|",
r"(?:(?:(?:(?:", IPV6H16!(), r":){0,2}", IPV6H16!(), r")?::(?:", IPV6H16!(), r":){2})", IPV6LS32!(), r")|",
r"(?:(?:(?:(?:", IPV6H16!(), r":){0,3}", IPV6H16!(), r")?::(?:", IPV6H16!(), r":){1})", IPV6LS32!(), r")|",
r"(?:(?:(?:(?:", IPV6H16!(), r":){0,4}", IPV6H16!(), r")?::", ")", IPV6LS32!(), r")|",
r"(?:(?:(?:(?:", IPV6H16!(), r":){0,5}", IPV6H16!(), r")?::", ")", IPV6H16!(), r")|",
r"(?:(?:(?:(?:", IPV6H16!(), r":){0,6}", IPV6H16!(), r")?::", ")))"))
}
/// Returns the regular expression string to match IP addresses (v4 or v6)
#[macro_export]
macro_rules! IPRE { () => (concat!(r"(?:", IPV4RE!(), "|", IPV6RE!(), ")")) }
lazy_static! {
pub static ref IP_REGEX: Regex = Regex::new(IPRE!()).unwrap();
pub static ref SHA256_HEX_REGEX: Regex =
Regex::new(r"^[a-f0-9]{64}$")
.unwrap();
pub static ref SYSTEMD_DATETIME_REGEX: Regex =
Regex::new(r"^\d{4}-\d{2}-\d{2}( \d{2}:\d{2}(:\d{2})?)?$")
.unwrap();
}