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

pi2/node/dns.rs: return file digest

This commit is contained in:
Dietmar Maurer 2019-01-25 11:03:41 +01:00
parent 2296860027
commit de6b0721fa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ use lazy_static::lazy_static;
use std::io::{BufRead, BufReader}; use std::io::{BufRead, BufReader};
use std::sync::Arc; use std::sync::Arc;
use openssl::sha;
use serde_json::{json, Value}; use serde_json::{json, Value};
@ -21,10 +22,11 @@ fn read_etc_resolv_conf() -> Result<Value, Error> {
let mut nscount = 0; let mut nscount = 0;
let file = std::fs::File::open(RESOLV_CONF_FN)?; let raw = tools::file_get_contents(RESOLV_CONF_FN)?;
let reader = BufReader::new(file);
let test = IPRE!(); result["digest"] = Value::from(tools::digest_to_hex(&sha::sha256(&raw)));
let data = String::from_utf8(raw)?;
lazy_static! { lazy_static! {
static ref DOMAIN_REGEX: regex::Regex = regex::Regex::new(r"^\s*(?:search|domain)\s+(\S+)\s*").unwrap(); static ref DOMAIN_REGEX: regex::Regex = regex::Regex::new(r"^\s*(?:search|domain)\s+(\S+)\s*").unwrap();
@ -32,8 +34,7 @@ fn read_etc_resolv_conf() -> Result<Value, Error> {
concat!(r"^\s*nameserver\s+(", IPRE!(), r")\s*")).unwrap(); concat!(r"^\s*nameserver\s+(", IPRE!(), r")\s*")).unwrap();
} }
for line in reader.lines() { for line in data.lines() {
let line = line?;
if let Some(caps) = DOMAIN_REGEX.captures(&line) { if let Some(caps) = DOMAIN_REGEX.captures(&line) {
result["search"] = Value::from(&caps[1]); result["search"] = Value::from(&caps[1]);