cubixle/radius-rs
1
0
Fork 0
mirror of https://github.com/cubixle/radius-rs.git synced 2026-04-30 11:18:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix type opt handling

Browse Source
This commit is contained in:
moznion
2020-11-29 02:09:59 +09:00
parent a975e7ca69
commit 3d8488d7b4
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code_generator/src/main.rs
+4 -8
View File
@@ -413,7 +413,6 @@ fn parse_dict_file(dict_file_path: &Path) -> Result<DictParsed, String> {
let line_filter_re = Regex::new(r"^(?:#.*|)$").unwrap(); let line_filter_re = Regex::new(r"^(?:#.*|)$").unwrap();
let tabs_re = Regex::new(r"\t+").unwrap(); let tabs_re = Regex::new(r"\t+").unwrap();
let trailing_comment_re = Regex::new(r"\s*?#.+?$").unwrap(); let trailing_comment_re = Regex::new(r"\s*?#.+?$").unwrap();
let spaces_re = Regex::new(r"\s+").unwrap();
let mut radius_attributes: Vec<RadiusAttribute> = Vec::new(); let mut radius_attributes: Vec<RadiusAttribute> = Vec::new();
let mut radius_attribute_to_values: BTreeMap<String, Vec<RadiusValue>> = BTreeMap::new(); let mut radius_attribute_to_values: BTreeMap<String, Vec<RadiusValue>> = BTreeMap::new();
@@ -435,14 +434,11 @@ fn parse_dict_file(dict_file_path: &Path) -> Result<DictParsed, String> {
let kind = items[0]; let kind = items[0];
match kind { match kind {
ATTRIBUTE_KIND => { ATTRIBUTE_KIND => {
let attribute_type_leaf = trailing_comment_re.replace(items[3], "").to_string();
let type_descriptions: Vec<&str> = spaces_re.split(&attribute_type_leaf).collect();
let mut encryption_type: Option<EncryptionType> = None; let mut encryption_type: Option<EncryptionType> = None;
let mut has_tag = false; let mut has_tag = false;
if type_descriptions.len() >= 2 { if items.len() >= 5 {
// TODO consider to extract to a method // TODO consider to extract to a method
for type_opt in type_descriptions[1].split(',') { for type_opt in items[4].split(',') {
if type_opt == USER_PASSWORD_TYPE_OPT { if type_opt == USER_PASSWORD_TYPE_OPT {
encryption_type = Some(EncryptionType::UserPassword); encryption_type = Some(EncryptionType::UserPassword);
continue; continue;
@@ -458,7 +454,7 @@ fn parse_dict_file(dict_file_path: &Path) -> Result<DictParsed, String> {
} }
} }
let typ = match RadiusAttributeValueType::from_str(type_descriptions[0]) { let typ = match RadiusAttributeValueType::from_str(items[3]) {
Ok(t) => { Ok(t) => {
if t == RadiusAttributeValueType::String { if t == RadiusAttributeValueType::String {
match encryption_type { match encryption_type {
@@ -475,7 +471,7 @@ fn parse_dict_file(dict_file_path: &Path) -> Result<DictParsed, String> {
} }
} }
Err(_) => { Err(_) => {
return Err(format!("invalid type has come => {}", type_descriptions[0])); return Err(format!("invalid type has come => {}", items[3]));
} }
}; };
dicts/dictionary.rfc2865
+1 -1
View File
@@ -9,7 +9,7 @@
# $Id$ # $Id$
# #
ATTRIBUTE User-Name 1 string ATTRIBUTE User-Name 1 string
ATTRIBUTE User-Password 2 string encrypt=1 ATTRIBUTE User-Password 2 string encrypt=1
ATTRIBUTE CHAP-Password 3 octets ATTRIBUTE CHAP-Password 3 octets
ATTRIBUTE NAS-IP-Address 4 ipaddr ATTRIBUTE NAS-IP-Address 4 ipaddr
ATTRIBUTE NAS-Port 5 integer ATTRIBUTE NAS-Port 5 integer