mehmeteribol/kilit - Change OODP6A3DVCR34VVQQDMRYWX3U2CNCDB7VGYGPNGSP4H7AFVORI3AC

Removed threads. No need that complicated things

Created by 8DLwXB6S2i9B9SmFpsBqMLrxCFqtfRD7gRvguLB657S9 on February 22, 2024

OODP6A3DVCR34VVQQDMRYWX3U2CNCDB7VGYGPNGSP4H7AFVORI3AC

Dependencies

In channels

main

Change contents

Insertion in src/main.rs at line 16 [3.49]
[3.371]
[3.371]
```
use rsa::RsaPrivateKey;
```
Insertion in src/main.rs at line 67 [3.49]
[3.1951]
[3.1951]
```
    let mut lock_state = LockState::Locked;
```

Replacement in src/main.rs at line 69 [3.49]

B:BD[3.1962] → [3.1962:2179]

        let mut is_unlock = std::sync::Arc::new(std::sync::Mutex::new(LockState::Locked));
        if est_time.elapsed().as_secs() >= lock_time
            && *is_unlock.lock().unwrap() != LockState::Locked
        {

[3.1962]

[3.2179]

        if est_time.elapsed().as_secs() >= lock_time && lock_state == LockState::Locked {

Replacement in src/main.rs at line 72 [3.49]

B:BD[3.2213] → [3.2213:2673]

        let priv_key = priv_key.clone();
        let is_unlock2 = std::sync::Arc::clone(&is_unlock);
        thread::spawn(move || {
            let is_unlock = std::sync::Arc::clone(&is_unlock);
            let mut devices = devices::get_devices();
            for device in &devices {
                if device.read_key(&priv_key.clone()) {
                    *is_unlock.lock().unwrap() = LockState::Unlocked(UnlockedState::Usb);
                    break;

[3.2213]

[3.2673]

        match &lock_state {
            LockState::Locked => {
                if !check_usb(&priv_key, &mut lock_state) {
                    check_key(&mut lock_state);

Replacement in src/main.rs at line 78 [3.49]

B:BD[3.2705] → [3.2705:3202]

B:BD[3.3202] → [2.196:301]

∅:D[2.301] → [3.3202:3263]

B:BD[3.3202] → [3.3202:3263]

B:BD[3.3298] → [3.3298:3498]

B:BD[3.3498] → [2.302:348]

            if *is_unlock.lock().unwrap() != LockState::Locked {
                est_time = Instant::now();
            } else {
                log::info!("0 {}", lock_time - est_time.elapsed().as_secs());
            }
        });
        thread::spawn(move || {
            let is_unlock = std::sync::Arc::clone(&is_unlock2);
            if *is_unlock.lock().unwrap() == LockState::Locked && confirm_key() {
                *is_unlock.lock().unwrap() = LockState::Unlocked(UnlockedState::Key);
                println!("1 3");
                std::fs::remove_file("/tmp/kilit").unwrap_or_default();
                thread::sleep(Duration::from_secs(40 * 60));
                *is_unlock.lock().unwrap() == LockState::Locked;
                est_time = Instant::now();
                log::info!("0 {}", lock_time - est_time.elapsed().as_secs());
            }
        })
        .join()
        .unwrap();

[3.2705]

[3.3510]

            LockState::Unlocked(unlock) => match unlock {
                UnlockedState::Usb(serial) => {
                    log::info!("1 0");
                    let devices = get_devices();
                    if !devices.iter().any(|d| &d.get_serial() == serial) {
                        lock_state = LockState::Locked;
                    }
                }
                UnlockedState::Key => {
                    log::info!("1 1");
                    thread::sleep(Duration::from_secs(60 * 40));
                }
            },
        }

Replacement in src/main.rs at line 96 [3.49]

B:BD[3.3571] → [3.3571:3572]

[3.3571]

[3.3572]

fn check_usb(priv_key: &RsaPrivateKey, state: &mut LockState) -> bool {
    let mut devices = devices::get_devices();
    for device in &devices {
        if device.read_key(&priv_key.clone()) {
            *state = LockState::Unlocked(UnlockedState::Usb(device.get_serial()));
            return true;
        }
    }
    true
}
fn check_key(state: &mut LockState) -> bool {
    if confirm_key() {
        std::fs::remove_file("/tmp/kilit").unwrap_or_default();
        return true;
    }
    false
}

Insertion in src/main.rs at line 114 [3.49]

[3.3599]

[2.349]

    let schoold_id = env::var("SCHOOL_ID").unwrap_or("1".to_string());

Replacement in src/main.rs at line 143 [3.49]
B:BD[3.4338] → [3.4338:4347]
```
    Usb,
```
[3.4338]
[3.4347]
```
    Usb(String),
```

Replacement in src/devices.rs at line 175 [3.5945]

B:BD[3.10919] → [3.10919:10964]

        println!("etap kilit oluşturuldu");

[3.10919]

[3.10964]

        // println!("etap kilit oluşturuldu");

Replacement in src/devices.rs at line 182 [3.5945]
B:BD[3.11249] → [3.11249:11280]
```
            log::info!("1 0");
```
[3.11249]
[3.11280]
```
            // log::info!("1 0");
```

Replacement in src/devices.rs at line 194 [3.5945]

B:BD[3.11762] → [3.11762:11805]

                        log::info!("1 1");

[3.11762]

[3.11805]

                        // log::info!("1 1");

Replacement in src/devices.rs at line 203 [3.5945]

B:BD[3.12082] → [3.12082:12124]

                println!("{enc_data:?}");

[3.12082]

[3.12124]

                // println!("{enc_data:?}");

Replacement in src/devices.rs at line 213 [3.5945]

B:BD[3.12773] → [3.12773:12824]

                                log::info!("1 2");

[3.12773]

[3.12824]

                                // log::info!("1 2");

Insertion in src/devices.rs at line 232 [3.5945]

[3.13236]

    pub fn get_serial(&self) -> String {
        self.serial_number.clone()
    }