Skip to content
Snippets Groups Projects

Update urls in provider config for bitmask provider

Merged Pea Nut requested to merge fix-921 into main
All threads resolved!

Issue: #269 (closed)

Edited by Pea Nut

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • changed milestone to %2025.02 LEAP VPN Release

  • assigned to @peanut2

    • Author Developer
      Resolved by Pea Nut

      Yet another update:

      • in the provider config, ther is a field caURL
      • in the repo, the ca cert is hardcoded:
      pea@peabox:bitmask-vpn git ls-files | grep ca.crt                      
      branding/scripts/check-ca-crt
      providers/bitmask/bitmask-ca.crt
      providers/calyx/calyx-ca.crt
      providers/demolib/demolib-ca.crt
      providers/floatdemo/floatdemo-ca.crt
      providers/riseup/riseup-ca.crt
      providers/riseupbeta/riseupbeta-ca.crt
      • there is a target vendor_check which calls the python script branding/scripts/check-ca-crt
        • it checks if the online version (url in the config) and the local file (providers/bitmask/bitmask-ca.crt) matches
      pea@peabox:bitmask-vpn make vendor_check
      [+] Checking your provider config...
      [+] CA file ok: /home/pea/projects/leap/bitmask-vpn/providers/bitmask/bitmask-ca.crt
      ... checking cert from https://api.ft1.bitmask.net/ca.crt
      [!] ERROR: remote and local CA certs do not match
      make: *** [Makefile:356: vendor_check] Error 1

      This could be simplified:

      • dont save ca.crt in the repo
      • instead, fetch it from the url
      • we don't use vendor_check right now - we should add it to the allinone target or remove it
      Edited by Pea Nut
  • Author Developer

    This is normal for the desktop, right? As we don't have a /json endpoint for bitmask

    2024-11-05T11:46:07+01:00 WRN Could not fetch geolocation error="Post \"https://menshen.ft1.bitmask.net/json\": dial tcp: lookup menshen.ft1.bitmask.net: no such host"                                                                        2024-11-05T11:46:07+01:00 TRC Setting GUI status status=starting                                                                                                                                                                               
    2024-11-05T11:46:07+01:00 WRN Could not fetch geolocation error="Post \"https://menshen.ft1.bitmask.net/json\": dial tcp: lookup menshen.ft1.bitmask.net: no such host"                                                                        
    2024-11-05T11:46:07+01:00 INF Got best gateway [{gw2.ft1.bitmask.net 37.218.245.94 North Brabant Netherlands NL [53 80 1194] [tcp udp] map[] openvpn} {gwft1.ft1.bitmask.net 37
  • Pea Nut added 2 commits

    added 2 commits

    • 467c02e7 - Update urls in provider config for bitmask provider
    • ccc3595c - [Makefile] Call vendor_check in allinone target

    Compare with previous version

  • Pea Nut added 30m of time spent at 2024-11-04

    added 30m of time spent at 2024-11-04

  • Pea Nut requested review from @jkito

    requested review from @jkito

  • Pea Nut marked this merge request as draft

    marked this merge request as draft

  • Pea Nut added 1 commit

    added 1 commit

    • b62f9ca1 - Update urls in provider config for bitmask provider

    Compare with previous version

  • Pea Nut resolved all threads

    resolved all threads

  • Pea Nut added 15m of time spent at 2024-11-05

    added 15m of time spent at 2024-11-05

  • Pea Nut marked this merge request as ready

    marked this merge request as ready

  • Pea Nut changed the description

    changed the description

  • Pea Nut mentioned in issue #921 (closed)

    mentioned in issue #921 (closed)

  • jkito approved this merge request

    approved this merge request

  • merged

Please register or sign in to reply
Loading